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

Settings - Changes users password + Photo

Browse source
This commit is contained in:
Sagi Dayan 2016-07-09 04:19:00 +03:00
commit c1e05033d5
46 changed files with 835 additions and 533 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.idea/inspectionProfiles/Project_Default.xml
View file

@ -2,6 +2,7 @@
<profile version="1.0"> <profile version="1.0">
<option name="myName" value="Project Default" /> <option name="myName" value="Project Default" />
<inspection_tool class="AndroidLintButtonStyle" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="AndroidLintButtonStyle" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="AndroidLintUseCompoundDrawables" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false"> <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" /> <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" /> <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />

3
.idea/libraries/animated_vector_drawable_23_4_0.xml
View file

@ -1,11 +1,12 @@
<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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars/classes.jar!/" />
</CLASSES> </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:///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>

3
.idea/libraries/appcompat_v7_23_4_0.xml
View file

@ -4,11 +4,12 @@
<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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/res" />
</CLASSES> </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:///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>

3
.idea/libraries/design_23_4_0.xml
View file

@ -4,11 +4,12 @@
<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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/res" />
</CLASSES> </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:///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>

2
.idea/libraries/firebase_analytics_impl_9_2_0.xml
View file

@ -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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/9.2.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/9.2.0/res" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/firebase_auth_9_2_0.xml
View file

@ -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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth/9.2.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth/9.2.0/res" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/firebase_auth_common_9_2_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-common/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-common/9.2.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-common/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-common/9.2.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/firebase_auth_module_9_2_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-module/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-module/9.2.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-module/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-module/9.2.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/firebase_config_9_2_0.xml
View file

@ -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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-config/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-config/9.2.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-config/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-config/9.2.0/res" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/firebase_crash_9_2_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-crash/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-crash/9.2.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-crash/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-crash/9.2.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/firebase_database_9_2_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-database/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-database/9.2.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-database/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-database/9.2.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/firebase_messaging_9_2_0.xml
View file

@ -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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/9.2.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/9.2.0/res" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/firebase_storage_9_2_0.xml
View file

@ -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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage/9.2.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage/9.2.0/res" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/firebase_storage_common_9_2_0.xml
View file

@ -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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage-common/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage-common/9.2.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage-common/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage-common/9.2.0/res" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

3
.idea/libraries/mediarouter_v7_23_0_0.xml
View file

@ -5,11 +5,12 @@
</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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/23.0.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/23.0.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/23.0.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/23.0.0/jars/classes.jar!/" />
</CLASSES> </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:///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>

2
.idea/libraries/play_services_9_2_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services/9.2.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services/9.2.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/play_services_appindexing_9_2_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/9.2.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/9.2.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/play_services_auth_base_9_2_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth-base/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth-base/9.2.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth-base/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth-base/9.2.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/play_services_basement_9_2_0.xml
View file

@ -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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.2.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.2.0/res" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/play_services_cast_9_2_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/9.2.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/9.2.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/play_services_contextmanager_9_2_0.xml
View file

@ -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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-contextmanager/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-contextmanager/9.2.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-contextmanager/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-contextmanager/9.2.0/res" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/play_services_location_9_2_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.2.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.2.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/play_services_plus_9_2_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/9.2.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/9.2.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/play_services_tagmanager_api_9_2_0.xml
View file

@ -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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager-api/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager-api/9.2.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager-api/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager-api/9.2.0/res" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/play_services_tasks_9_2_0.xml
View file

@ -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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.2.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.2.0/res" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
.idea/libraries/play_services_vision_9_2_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-vision/9.2.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-vision/9.2.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-vision/9.2.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-vision/9.2.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

3
.idea/libraries/recyclerview_v7_23_4_0.xml
View file

@ -4,11 +4,12 @@
<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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/res" />
</CLASSES> </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:///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>

3
.idea/libraries/support_annotations_23_4_0.xml
View file

@ -1,10 +1,11 @@
<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$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.4.0/support-annotations-23.4.0.jar!/" /> <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.4.0/support-annotations-23.4.0.jar!/" />
</CLASSES> </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:///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>

3
.idea/libraries/support_v4_23_4_0.xml
View file

@ -5,11 +5,12 @@
</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="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars/classes.jar!/" /> <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/res" />
</CLASSES> </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:///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>

1
.idea/libraries/support_vector_drawable_23_4_0.xml
View file

@ -6,6 +6,7 @@
</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:///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>

2
.idea/libraries/volley_1_0_0.xml
View file

@ -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="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.volley/volley/1.0.0/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.volley/volley/1.0.0/res" /> <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.volley/volley/1.0.0/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.volley/volley/1.0.0/jars/classes.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>

46
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java
View file

@ -27,7 +27,7 @@ import java.util.List;
*/ */
public class GPSUtils extends Service implements LocationListener { public class GPSUtils extends Service implements LocationListener {
private static final String TAG ="GPSUtils" ; private static final String TAG = "GPSUtils";
private final Context mContext; private final Context mContext;
// flag for GPS status // flag for GPS status
@ -53,7 +53,7 @@ public class GPSUtils extends Service implements LocationListener {
getLocation(); getLocation();
} }
// public Location getLocation() { // public Location getLocation() {
// LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE); // LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
// if (locationManager != null) { // if (locationManager != null) {
// Location lastKnownLocationGPS = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER); // Location lastKnownLocationGPS = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
@ -70,7 +70,7 @@ public class GPSUtils extends Service implements LocationListener {
// } // }
public Location getLocation() { public Location getLocation() {
try { try {
Log.d("TAG","in get location"); Log.d("TAG", "in get location");
locationManager = locationManager =
(LocationManager) mContext (LocationManager) mContext
.getSystemService(LOCATION_SERVICE); .getSystemService(LOCATION_SERVICE);
@ -91,10 +91,10 @@ public class GPSUtils extends Service implements LocationListener {
if (isNetworkEnabled) { if (isNetworkEnabled) {
if (ContextCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) { if (ContextCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
Log.e("TAG", "No Permissions"); Log.e("TAG", "No Permissions");
((MainActivity)mContext).setLocationPermission(false); Utils.setLocationPermission(false);
return null; return null;
}else{ } else {
((MainActivity)mContext).setLocationPermission(true); Utils.setLocationPermission(true);
} }
Log.d(TAG, "Network"); Log.d(TAG, "Network");
if (locationManager != null) { if (locationManager != null) {
@ -120,8 +120,7 @@ public class GPSUtils extends Service implements LocationListener {
} }
} }
} }
} } else {
else{
location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER); location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER);
} }
} }
@ -133,7 +132,7 @@ public class GPSUtils extends Service implements LocationListener {
return location; return location;
} }
public void showSettingsAlert(){ public void showSettingsAlert() {
AlertDialog.Builder alertDialog = new AlertDialog.Builder(mContext); AlertDialog.Builder alertDialog = new AlertDialog.Builder(mContext);
// Setting Dialog Title // Setting Dialog Title
@ -144,7 +143,7 @@ public class GPSUtils extends Service implements LocationListener {
// On pressing Settings button // On pressing Settings button
alertDialog.setPositiveButton("Settings", new DialogInterface.OnClickListener() { alertDialog.setPositiveButton("Settings", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,int which) { public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
mContext.startActivity(intent); mContext.startActivity(intent);
} }
@ -188,13 +187,13 @@ public class GPSUtils extends Service implements LocationListener {
return null; return null;
} }
public List<Address> getFromLocation(double latitude, double longitude, int maxResults){ public List<Address> getFromLocation(double latitude, double longitude, int maxResults) {
try { try {
List<Address> addresses; List<Address> addresses;
geocoder = new Geocoder(mContext); geocoder = new Geocoder(mContext);
if (latitude != 0 || longitude != 0) { if (latitude != 0 || longitude != 0) {
addresses = geocoder.getFromLocation(latitude , addresses = geocoder.getFromLocation(latitude,
longitude, maxResults); longitude, maxResults);
return addresses; return addresses;
@ -212,11 +211,11 @@ public class GPSUtils extends Service implements LocationListener {
/** /**
* Function to get latitude * Function to get latitude
* */ */
public double getLatitude(){ public double getLatitude() {
if(location != null){ if (location != null) {
latitude = location.getLatitude(); latitude = location.getLatitude();
}else{ } else {
Log.d("Tag", "Got NULL"); Log.d("Tag", "Got NULL");
} }
@ -226,9 +225,9 @@ public class GPSUtils extends Service implements LocationListener {
/** /**
* Function to get longitude * Function to get longitude
* */ */
public double getLongitude(){ public double getLongitude() {
if(location != null){ if (location != null) {
longitude = location.getLongitude(); longitude = location.getLongitude();
} }
@ -236,21 +235,20 @@ public class GPSUtils extends Service implements LocationListener {
return longitude; return longitude;
} }
public Location getLastKnownLocation(){ public Location getLastKnownLocation() {
if (location == null) if (location == null)
return getLocation(); return getLocation();
return location; return location;
} }
public String getAddress() { public String getAddress() {
String address=""; String address = "";
List<Address> listAddress = getFromLocation(getLatitude(), getLongitude(), 1);
List<Address> listAddress = getFromLocation(getLatitude(),getLongitude(),1);
for (int i = 0; i <= listAddress.get(0).getMaxAddressLineIndex(); i++) { for (int i = 0; i <= listAddress.get(0).getMaxAddressLineIndex(); i++) {
listAddress.get(0).getAddressLine(i); listAddress.get(0).getAddressLine(i);
address += listAddress.get(0).getAddressLine(i)+" "; address += listAddress.get(0).getAddressLine(i) + " ";
} }
return address; return address;
} }

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

@ -19,6 +19,7 @@ import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
@ -176,14 +177,15 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
final Note note = eventMarkerMap.get(marker); final Note note = eventMarkerMap.get(marker);
final Dialog noteViewDialog = new Dialog(getActivity()); final Dialog noteViewDialog = new Dialog(getActivity());
noteViewDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
noteViewDialog.setContentView(R.layout.note_display_full); noteViewDialog.setContentView(R.layout.note_display_full);
boolean isOwner = note.getOwnerId().equals(mainActivity.getUserId()); boolean isOwner = note.getOwnerId().equals(mainActivity.getUserId());
if (isOwner) // if (isOwner)
noteViewDialog.setTitle("You wrote..."); // noteViewDialog.setTitle("You wrote...");
else // else
noteViewDialog.setTitle("Someone wrote..."); // noteViewDialog.setTitle("Someone wrote...");
noteViewDialog.show(); noteViewDialog.show();
@ -191,24 +193,29 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
final TextView title = (TextView) noteViewDialog.findViewById(R.id.ndf_title_textview); final TextView title = (TextView) noteViewDialog.findViewById(R.id.ndf_title_textview);
final TextView body = (TextView) noteViewDialog.findViewById(R.id.ndf_body_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 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 location = (TextView) noteViewDialog.findViewById(R.id.ndf_address_textview);
final TextView likes = (TextView) noteViewDialog.findViewById(R.id.ndf_likes_textview); final TextView likes = (TextView) noteViewDialog.findViewById(R.id.ndf_likes_textview);
final TextView tags = (TextView) noteViewDialog.findViewById(R.id.ndf_tags_textview); // final TextView tags = (TextView) noteViewDialog.findViewById(R.id.ndf_tags_textview);
final TextView permission = (TextView) noteViewDialog.findViewById(R.id.ndf_permission_textview); final TextView permission = (TextView) noteViewDialog.findViewById(R.id.ndf_permission_textview);
final ImageView avatar = (ImageView) noteViewDialog.findViewById(R.id.note_user_avatar); final ImageView avatar = (ImageView) noteViewDialog.findViewById(R.id.note_user_avatar);
final ImageView permissionImg = (ImageView) noteViewDialog.findViewById(R.id.permission_image);
final ImageButton deleteBtn = (ImageButton) noteViewDialog.findViewById(R.id.ndf_delete_imagebutton); final ImageButton deleteBtn = (ImageButton) noteViewDialog.findViewById(R.id.ndf_delete_imagebutton);
title.setText(note.getTitle()); title.setText(note.getTitle());
body.setText(note.getBody()); body.setText(note.getBody());
time.setText(note.getTimestamp()); time.setText(note.getTime());
location.setText("Address: " + note.getAddress()); date.setText(note.getDate());
likes.setText("Likes: " + note.getLikes());
tags.setText("Tags: " + note.getTags().toString()); location.setText("" + note.getAddress());
likes.setText("" + note.getLikes());
// tags.setText("Tags: " + note.getTags().toString());
Utils.URLtoImageView(avatar, note.getAvatar()); Utils.URLtoImageView(avatar, note.getAvatar());
if (isOwner) { if (isOwner) {
permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private")); permission.setText("" + (note.isPublic() ? "Public" : "Private"));
} else { } else {
permissionImg.setVisibility(View.INVISIBLE);
permission.setText(""); permission.setText("");
deleteBtn.setBackgroundResource(R.drawable.like_icon); deleteBtn.setBackgroundResource(R.drawable.like_icon);
} }

44
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
View file

@ -3,6 +3,8 @@ package com.android_app.matan.ara.sagi.thesocialnotework;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.support.v4.app.ActivityCompat;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
@ -40,6 +42,8 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
private final String LOGIN_PATH = "/login"; private final String LOGIN_PATH = "/login";
private LoginActivity self; //this private LoginActivity self; //this
protected LinearLayout layout; protected LinearLayout layout;
private boolean permissionsReturend = false;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -59,6 +63,9 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
this.mLoginButton.setOnClickListener(this); this.mLoginButton.setOnClickListener(this);
this.mLoginButton.setEnabled(false); this.mLoginButton.setEnabled(false);
//check for permission
// while(!permissionsReturend);
} }
private void removeFocuse() { private void removeFocuse() {
@ -220,5 +227,42 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
public void afterTextChanged(Editable editable) { public void afterTextChanged(Editable editable) {
} }
// @Override
// public void onRequestPermissionsResult(int requestCode,
// String permissions[], int[] grantResults) {
// permissionsReturend = true;
// Log.d(TAG, "onRequestPermissionsResult: in func");
// switch (requestCode) {
// case FINE_PERM: {
// // If request is cancelled, the result arrays are empty.
// if (grantResults.length > 0
// && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
// Log.d(TAG, "onRequestPermissionsResult: got permission for location");
// Utils.setLocationPermission(true);
// ActivityCompat.requestPermissions(LoginActivity.this, new String[]{android.Manifest.permission.CAMERA}, CAMERA_PERM);
// } else {
// Log.d(TAG, "onRequestPermissionsResult:DIDNT get permission for location");
//
// Toast.makeText(LoginActivity.this,"No Location Permissions granted.\n\"An App is nothing without its permissions\"",Toast.LENGTH_LONG);
//// System.exit(0);
// }
// return;
// }
// case CAMERA_PERM: {
// if (grantResults.length > 0
// && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
// Log.d(TAG, "onRequestPermissionsResult: got permission for camera");
// Utils.setCameraPermission(true);
//
//
// } else {
// Log.d(TAG, "onRequestPermissionsResult: DIDNT get permission for camera");
// Toast.makeText(LoginActivity.this,"No Camera Permissions granted.\n\"An App is nothing without its permissions\"",Toast.LENGTH_LONG);
// }
// return;
// }
// }
// }
} }

73
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/MainActivity.java
View file

@ -1,9 +1,11 @@
package com.android_app.matan.ara.sagi.thesocialnotework; package com.android_app.matan.ara.sagi.thesocialnotework;
import android.*;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.os.AsyncTask; import android.os.AsyncTask;
@ -11,6 +13,7 @@ import android.os.Bundle;
import android.os.StrictMode; import android.os.StrictMode;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -54,6 +57,7 @@ public class MainActivity extends AppCompatActivity
private ImageView menu_avatar; private ImageView menu_avatar;
private MainActivity self; private MainActivity self;
private NavigationView nav_view; private NavigationView nav_view;
private final int FINE_PERM = 0, CAMERA_PERM = 1;
@Override @Override
@ -71,10 +75,6 @@ public class MainActivity extends AppCompatActivity
StrictMode.setThreadPolicy(policy); StrictMode.setThreadPolicy(policy);
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
@ -92,7 +92,7 @@ public class MainActivity extends AppCompatActivity
//Get The Nav_View Avatar View //Get The Nav_View Avatar View
nav_view = (NavigationView) findViewById(R.id.nav_view); nav_view = (NavigationView) findViewById(R.id.nav_view);
View header_v = nav_view.getHeaderView(0); View header_v = nav_view.getHeaderView(0);
menu_avatar = (ImageView)header_v.findViewById(R.id.nav_user_avatar); menu_avatar = (ImageView) header_v.findViewById(R.id.nav_user_avatar);
//Change Layout //Change Layout
@ -155,14 +155,14 @@ public class MainActivity extends AppCompatActivity
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
} else if (id == R.id.nav_map) { } else if (id == R.id.nav_map) {
Log.d(TAG,"Before going to map"); Log.d(TAG, "Before going to map");
toolbar.setTitle("Map"); toolbar.setTitle("Map");
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
ft.replace(R.id.fragment_container, gmapFragment); ft.replace(R.id.fragment_container, gmapFragment);
ft.commit(); ft.commit();
} else if (id == R.id.nav_personal) { } else if (id == R.id.nav_personal) {
Log.d(TAG,"Before going to personal"); Log.d(TAG, "Before going to personal");
ft.replace(R.id.fragment_container, personalFragment); ft.replace(R.id.fragment_container, personalFragment);
ft.commit(); ft.commit();
} else if (id == R.id.nav_settings) { } else if (id == R.id.nav_settings) {
@ -190,27 +190,60 @@ public class MainActivity extends AppCompatActivity
return this.gpsUtils; return this.gpsUtils;
} }
public void setLocationPermission(boolean locationPermission) {
this.locationPermission = locationPermission;
}
public User getUser() {
public User getUser(){
return user; return user;
} }
public String getUserId(){return user.getId();} public String getUserId() {
return user.getId();
}
public void updateNavAvatar(){ @Override
public void onRequestPermissionsResult(int requestCode,
String permissions[], int[] grantResults) {
Log.d(TAG, "onRequestPermissionsResult: in func");
switch (requestCode) {
case FINE_PERM: {
// If request is cancelled, the result arrays are empty.
if (grantResults.length > 2) {
if (!(grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
Log.d(TAG, "onRequestPermissionsResult: Did Not get permission for location");
Toast.makeText(MainActivity.this, "No Location Permissions granted.\n\"An App is nothing without its permissions\"", Toast.LENGTH_LONG).show();
System.exit(0);
}
if (!(grantResults[1] == PackageManager.PERMISSION_GRANTED)) {
Log.d(TAG, "onRequestPermissionsResult:DIDNT get permission for camera");
Toast.makeText(MainActivity.this, "No Camera Permissions granted.\nyou will not be able to change avatar", Toast.LENGTH_LONG).show();
Utils.setCameraPermission(false);
} else {
Utils.setCameraPermission(true);
}
if (grantResults[2] != PackageManager.PERMISSION_GRANTED) {
Log.d(TAG, "onRequestPermissionsResult:DIDNT get READ\\WRITE External storage permission");
Toast.makeText(MainActivity.this, "No READ\\WRITE External storage Permissions granted.\nyou will not be able to change avatar", Toast.LENGTH_LONG).show();
Utils.setCameraPermission(false);
} else {
Utils.setCameraPermission(true);
}
return;
}
}
}
}
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, "Profile Updated!", Toast.LENGTH_LONG).show();
} }
} }

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

@ -212,7 +212,7 @@ public class Note implements Parcelable {
} }
public String getDate() { public String getDate() {
Date d = new Date(); Date d = new Date(timestamp);
DateFormat format = new SimpleDateFormat("dd MMM yyy"); DateFormat format = new SimpleDateFormat("dd MMM yyy");
return format.format(d); return format.format(d);
} }

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

@ -19,6 +19,7 @@ import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.Button; import android.widget.Button;
@ -51,7 +52,6 @@ import java.util.List;
public class PersonalFragment extends Fragment { public class PersonalFragment extends Fragment {
protected ListView noteList; protected ListView noteList;
private final int FINE_PERM = 0;
private final String BASE_URL = "http://thesocialnotework-api.appspot.com/api"; private final String BASE_URL = "http://thesocialnotework-api.appspot.com/api";
private GPSUtils gpsUtils; private GPSUtils gpsUtils;
private List<Note> listOfNotes; private List<Note> listOfNotes;
@ -59,6 +59,8 @@ public class PersonalFragment extends Fragment {
private String userId; private String userId;
private final String TAG = "[TSN/PersonalFragment]"; private final String TAG = "[TSN/PersonalFragment]";
private MainActivity activity; private MainActivity activity;
private final int FINE_PERM = 0, CAMERA_PERM = 1;
public PersonalFragment() { public PersonalFragment() {
// Required empty public constructor // Required empty public constructor
@ -74,8 +76,21 @@ public class PersonalFragment extends Fragment {
Bundle bundle = getArguments(); Bundle bundle = getArguments();
this.userId = activity.getUserId(); this.userId = activity.getUserId();
Log.d(TAG, "onCreateView: userID: " + userId); Log.d(TAG, "onCreateView: userID: " + userId);
//check for permission
ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, FINE_PERM); ActivityCompat.requestPermissions(activity, new String[]{
android.Manifest.permission.ACCESS_FINE_LOCATION,
android.Manifest.permission.CAMERA,
Manifest.permission.WRITE_EXTERNAL_STORAGE
},
FINE_PERM
);
// ActivityCompat.requestPermissions(activity, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION}, FINE_PERM);
// if (!Utils.arePermissionsGranted()) {
// Toast.makeText(getContext(), "Missing some Permissions...\nPlease go to app info and enable them", Toast.LENGTH_LONG).show();
// }
this.noteList = (ListView) view.findViewById(R.id.ps_list_listview); this.noteList = (ListView) view.findViewById(R.id.ps_list_listview);
@ -237,6 +252,7 @@ public class PersonalFragment extends Fragment {
try { try {
//need to get all notes and add to listOfNotes //need to get all notes and add to listOfNotes
JSONArray noteObjectsArray = response.getJSONArray("notes"); JSONArray noteObjectsArray = response.getJSONArray("notes");
activity.getUser().setNumber_of_notes(noteObjectsArray.length());
Date time = new Date(); Date time = new Date();
for (int i = 0; i < noteObjectsArray.length(); i++) { for (int i = 0; i < noteObjectsArray.length(); i++) {
JSONObject noteObject = noteObjectsArray.getJSONObject(i); JSONObject noteObject = noteObjectsArray.getJSONObject(i);
@ -287,9 +303,6 @@ public class PersonalFragment extends Fragment {
} }
private void addNoteFromJsonObj(JSONObject noteObject, Date time) throws JSONException { private void addNoteFromJsonObj(JSONObject noteObject, Date time) throws JSONException {
Note addNote = new Note( Note addNote = new Note(
noteObject.getString("id"), noteObject.getString("id"),
@ -316,8 +329,9 @@ public class PersonalFragment extends Fragment {
//create and configure dialog //create and configure dialog
final Note note = listOfNotes.get(position); final Note note = listOfNotes.get(position);
final Dialog noteViewDialog = new Dialog(getActivity()); final Dialog noteViewDialog = new Dialog(getActivity());
noteViewDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
noteViewDialog.setContentView(R.layout.note_display_full); noteViewDialog.setContentView(R.layout.note_display_full);
noteViewDialog.setTitle("You wrote..."); // noteViewDialog.setTitle("You wrote...");
WindowManager.LayoutParams lp = new WindowManager.LayoutParams(); WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
lp.copyFrom(noteViewDialog.getWindow().getAttributes()); lp.copyFrom(noteViewDialog.getWindow().getAttributes());
@ -331,21 +345,23 @@ public class PersonalFragment extends Fragment {
final TextView title = (TextView) noteViewDialog.findViewById(R.id.ndf_title_textview); final TextView title = (TextView) noteViewDialog.findViewById(R.id.ndf_title_textview);
final TextView body = (TextView) noteViewDialog.findViewById(R.id.ndf_body_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 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 location = (TextView) noteViewDialog.findViewById(R.id.ndf_address_textview);
final TextView likes = (TextView) noteViewDialog.findViewById(R.id.ndf_likes_textview); final TextView likes = (TextView) noteViewDialog.findViewById(R.id.ndf_likes_textview);
final TextView tags = (TextView) noteViewDialog.findViewById(R.id.ndf_tags_textview); // final TextView tags = (TextView) noteViewDialog.findViewById(R.id.ndf_tags_textview);
final TextView permission = (TextView) noteViewDialog.findViewById(R.id.ndf_permission_textview); final TextView permission = (TextView) noteViewDialog.findViewById(R.id.ndf_permission_textview);
final ImageButton deleteBtn = (ImageButton) noteViewDialog.findViewById(R.id.ndf_delete_imagebutton); final ImageButton deleteBtn = (ImageButton) noteViewDialog.findViewById(R.id.ndf_delete_imagebutton);
final ImageView avatar = (ImageView) noteViewDialog.findViewById(R.id.note_user_avatar); final ImageView avatar = (RoundAvatarImageView) noteViewDialog.findViewById(R.id.note_user_avatar);
title.setText(note.getTitle()); title.setText(note.getTitle());
body.setText(note.getBody()); body.setText(note.getBody());
time.setText(note.getTimestamp()); date.setText(note.getDate());
location.setText("Address: " + note.getAddress()); time.setText(note.getTime());
likes.setText("Likes: " + note.getLikes()); location.setText(note.getAddress());
tags.setText("Tags: "+ note.getTags().toString()); if (likes != null) likes.setText("" + note.getLikes());
permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private")); // tags.setText("Tags: "+ note.getTags().toString());
permission.setText("" + (note.isPublic() ? "Public" : "Private"));
Utils.URLtoImageView(avatar, note.getAvatar()); Utils.URLtoImageView(avatar, note.getAvatar());
deleteBtn.setOnClickListener(new View.OnClickListener() { deleteBtn.setOnClickListener(new View.OnClickListener() {
@ -367,6 +383,7 @@ public class PersonalFragment extends Fragment {
delNote.put("uid", userId); delNote.put("uid", userId);
delNote.put("nid", note.getId()); delNote.put("nid", note.getId());
VolleyUtilSingleton.getInstance(getActivity()).post(BASE_URL + "/note/delete", delNote, Utils.deleteNoteSuccessListener, Utils.genericErrorListener); VolleyUtilSingleton.getInstance(getActivity()).post(BASE_URL + "/note/delete", delNote, Utils.deleteNoteSuccessListener, Utils.genericErrorListener);
activity.getUser().setNumber_of_notes(activity.getUser().getNumber_of_notes()-1);
listOfNotes.remove(position); listOfNotes.remove(position);
} catch (JSONException e) { } catch (JSONException e) {

38
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/RoundAvatarImageView.java Normal file
View file

@ -0,0 +1,38 @@
package com.android_app.matan.ara.sagi.thesocialnotework;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Path;
import android.graphics.RectF;
import android.util.AttributeSet;
import android.widget.ImageView;
/**
* Created by matanbaryosef on 08/07/2016.
*/
public class RoundAvatarImageView extends ImageView {
public static float radius = 110.0f;
public RoundAvatarImageView(Context context) {
super(context);
}
public RoundAvatarImageView(Context context, AttributeSet attrs) {
super(context, attrs);
}
public RoundAvatarImageView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
@Override
protected void onDraw(Canvas canvas) {
//float radius = 36.0f;
Path clipPath = new Path();
RectF rect = new RectF(0, 0, this.getWidth(), this.getHeight());
clipPath.addRoundRect(rect, radius, radius, Path.Direction.CW);
canvas.clipPath(clipPath);
super.onDraw(canvas);
}
}

22
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java
View file

@ -4,6 +4,7 @@ import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.net.Uri; import android.net.Uri;
@ -18,6 +19,7 @@ import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
@ -41,6 +43,7 @@ public class SettingsFragment extends Fragment implements View.OnClickListener,
private Uri currentImgUri; private Uri currentImgUri;
private TextView lbl_num_of_notes, lbl_num_of_liked; private TextView lbl_num_of_notes, lbl_num_of_liked;
private User user; private User user;
private Button btn_save;
public SettingsFragment() { public SettingsFragment() {
@ -62,6 +65,7 @@ public class SettingsFragment extends Fragment implements View.OnClickListener,
this.parent = (MainActivity)getActivity(); this.parent = (MainActivity)getActivity();
Utils.showLoadingDialog(parent, "Just a sec...", ""); Utils.showLoadingDialog(parent, "Just a sec...", "");
this.user = parent.getUser(); this.user = parent.getUser();
Log.d(TAG, "onCreateView: "+user.toString());
this.cameraBtn = (ImageButton) view.findViewById(R.id.btn_camera); this.cameraBtn = (ImageButton) view.findViewById(R.id.btn_camera);
this.cameraBtn.setOnClickListener(this); this.cameraBtn.setOnClickListener(this);
this.avatarImage = (ImageView) view.findViewById(R.id.settings_userAvater_iamgeView); this.avatarImage = (ImageView) view.findViewById(R.id.settings_userAvater_iamgeView);
@ -72,6 +76,8 @@ public class SettingsFragment extends Fragment implements View.OnClickListener,
this.txt_username = (EditText)view.findViewById(R.id.txt_username); this.txt_username = (EditText)view.findViewById(R.id.txt_username);
this.lbl_num_of_notes = (TextView)view.findViewById(R.id.lbl_num_of_notes); this.lbl_num_of_notes = (TextView)view.findViewById(R.id.lbl_num_of_notes);
this.lbl_num_of_liked = (TextView)view.findViewById(R.id.lbl_num_of_liked); this.lbl_num_of_liked = (TextView)view.findViewById(R.id.lbl_num_of_liked);
this.btn_save = (Button)view.findViewById(R.id.btn_save);
this.btn_save.setOnClickListener(this);
this.txt_username.setEnabled(false); this.txt_username.setEnabled(false);
@ -81,8 +87,8 @@ public class SettingsFragment extends Fragment implements View.OnClickListener,
this.txt_password.setText(user.getPassword()); this.txt_password.setText(user.getPassword());
this.txt_email.setText(user.getEmail()); this.txt_email.setText(user.getEmail());
// this.lbl_num_of_notes.setText(user.getNumber_of_notes()); //TODO this.lbl_num_of_notes.setText(""+user.getNumber_of_notes()); //TODO
// this.lbl_num_of_notes.setText(user.getLiked_notes().size()); this.lbl_num_of_notes.setText(""+user.getLiked_notes().size());
Utils.dismissLoadingDialog(); Utils.dismissLoadingDialog();
@ -106,8 +112,18 @@ public class SettingsFragment extends Fragment implements View.OnClickListener,
switch(view.getId()){ switch(view.getId()){
case R.id.btn_camera: case R.id.btn_camera:
//check for permission //check for permission
ActivityCompat.requestPermissions(parent, new String[]{Manifest.permission.CAMERA}, 1); // ActivityCompat.requestPermissions(parent, new String[]{Manifest.permission.CAMERA}, 1);
if ((ActivityCompat.checkSelfPermission((MainActivity) getActivity(), android.Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED)
&&(ActivityCompat.checkSelfPermission((MainActivity) getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)) {
openCamera(view); openCamera(view);
}else{
Toast.makeText(getActivity(), "No Camera or Storage Permissions granted.\n\"An App is nothing without its permissions\"", Toast.LENGTH_LONG).show();
}
break;
case R.id.btn_save:
user.updateUser(parent);
break; break;
} }
} }

4
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/User.java
View file

@ -151,11 +151,13 @@ public class User {
} }
public void updateUser(final MainActivity activity){ public void updateUser(final MainActivity activity){
Log.d(TAG, "updateUser: ================================");
VolleyUtilSingleton.getInstance(activity).post(Utils.BASE_URL + "/user/upsert", this.toJSON(), new Response.Listener<JSONObject>() { VolleyUtilSingleton.getInstance(activity).post(Utils.BASE_URL + "/user/upsert", this.toJSON(), new Response.Listener<JSONObject>() {
@Override @Override
public void onResponse(JSONObject response) { public void onResponse(JSONObject response) {
try { try {
if(response.get("status") == "OK"){ if(response.get("status").equals("OK")){
Log.d(TAG, "onResponse: In OKOKOKOK");
activity.updateNavAvatar(); activity.updateNavAvatar();
SharedPreferences sharedPref = activity.getSharedPreferences(MainActivity.LOCAL_DATA_TSN, Context.MODE_PRIVATE); SharedPreferences sharedPref = activity.getSharedPreferences(MainActivity.LOCAL_DATA_TSN, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedPref.edit(); SharedPreferences.Editor editor = sharedPref.edit();

58
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Utils.java
View file

@ -4,6 +4,12 @@ import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffXfermode;
import android.graphics.Rect;
import android.graphics.RectF;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Environment; import android.os.Environment;
import android.util.Log; import android.util.Log;
@ -37,6 +43,8 @@ public class Utils {
private static HashMap<String, Bitmap> bitmapHash = new HashMap<>(); private static HashMap<String, Bitmap> bitmapHash = new HashMap<>();
public static final String PHOTOS_DIR_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + "/TheSocialNotework/"; public static final String PHOTOS_DIR_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + "/TheSocialNotework/";
private static boolean mLocationPermission = false;
private static boolean mCameraPermission = false;
public static Bitmap getBitmapFromURL(String url) { public static Bitmap getBitmapFromURL(String url) {
@ -69,6 +77,7 @@ public class Utils {
public void onErrorResponse(VolleyError error) { public void onErrorResponse(VolleyError error) {
Log.d(TAG, "genericErrorListener"); Log.d(TAG, "genericErrorListener");
error.printStackTrace(); error.printStackTrace();
Utils.dismissLoadingDialog();
} }
}; };
@ -137,7 +146,8 @@ public class Utils {
private static class setUserAvatar extends AsyncTask<Void, Void, Bitmap> { private static class setUserAvatar extends AsyncTask<Void, Void, Bitmap> {
private ImageView iv; private ImageView iv;
private String url; private String url;
public setUserAvatar(ImageView imageView, String url){
public setUserAvatar(ImageView imageView, String url) {
this.iv = imageView; this.iv = imageView;
this.url = url; this.url = url;
} }
@ -151,11 +161,53 @@ public class Utils {
} }
@Override @Override
protected void onPostExecute(Bitmap b){ protected void onPostExecute(Bitmap b) {
iv.setImageBitmap(b); iv.setImageBitmap(b);
} }
} }
public static Bitmap getRoundedCornerBitmap(Bitmap bitmap, int pixels) {
Log.d(TAG, "rounded bitmap");
Bitmap output = Bitmap.createBitmap(bitmap.getWidth(), bitmap
.getHeight(), Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(output);
final int color = 0xff424242;
final Paint paint = new Paint();
final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
final RectF rectF = new RectF(rect);
final float roundPx = pixels;
paint.setAntiAlias(true);
canvas.drawARGB(0, 0, 0, 0);
paint.setColor(color);
canvas.drawRoundRect(rectF, roundPx, roundPx, paint);
paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
canvas.drawBitmap(bitmap, rect, rect, paint);
return output;
}
public static void setLocationPermission(boolean locationPermission) {
mLocationPermission = locationPermission;
}
public static void setCameraPermission(boolean cameraPermission) {
mCameraPermission = cameraPermission;
}
public static boolean arePermissionsGranted() {
return (mLocationPermission && mCameraPermission);
}
public static boolean isCameraPermissionGranted(){
return mCameraPermission;
}
public static boolean isLocationPermissionGranted(){
return mLocationPermission;
}
} }

11
app/src/main/res/drawable/frame.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@android:color/transparent" />
<padding
android:top="6dp"
android:bottom="6dp"/>
<corners android:radius="35dp" />
<stroke android:width="1dp" android:color="@android:color/transparent" />
</shape>

BIN
app/src/main/res/drawable/permission_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 308 B

4
app/src/main/res/layout/fragment_settings.xml
View file

@ -44,10 +44,10 @@
<EditText <EditText
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:ems="10" android:ems="10"
android:id="@+id/txt_email" android:id="@+id/txt_email"
android:hint="Email" /> android:hint="Email"
android:inputType="none|text" />
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout

106
app/src/main/res/layout/note_display_full.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="@drawable/cast_ic_notification_1">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -15,10 +15,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView
<com.android_app.matan.ara.sagi.thesocialnotework.RoundAvatarImageView
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="70dp" android:layout_height="70dp"
android:id="@+id/note_user_avatar" /> android:id="@+id/note_user_avatar"
android:layout_centerInParent="true"
android:scaleType="centerCrop" />
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
@ -30,47 +33,118 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Title" android:text="Title"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_gravity="center" />
<TextView <TextView
android:id="@+id/ndf_body_textview" android:id="@+id/ndf_body_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Body" android:text="Body"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:id="@+id/imageView6"
android:src="@drawable/date_icon"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/ndf_date_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="New Text"
android:layout_marginLeft="10dp" />
<ImageView
android:layout_width="13dp"
android:layout_height="13dp"
android:id="@+id/imageView7"
android:scaleType="fitCenter"
android:src="@drawable/time_icon"
android:layout_marginLeft="10dp"
android:layout_gravity="center_vertical" />
<TextView <TextView
android:id="@+id/ndf_time_textview" android:id="@+id/ndf_time_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="New Text" /> android:text="New Text"
android:layout_marginLeft="10dp" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:id="@+id/imageView8"
android:src="@drawable/location_icon"
android:layout_gravity="center_vertical" />
<TextView <TextView
android:id="@+id/ndf_address_textview" android:id="@+id/ndf_address_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="New Text" />
<TextView
android:id="@+id/ndf_tags_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="New Text" android:text="New Text"
android:textAppearance="?android:attr/textAppearanceListItem" /> android:layout_marginLeft="10dp" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:id="@+id/permission_image"
android:src="@drawable/permission_icon"
android:layout_gravity="center_vertical" />
<TextView <TextView
android:id="@+id/ndf_permission_textview" android:id="@+id/ndf_permission_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="New Text" /> android:text="New Text"
android:layout_marginLeft="10dp" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:id="@+id/imageView9"
android:src="@drawable/like_icon"
android:layout_gravity="center_vertical" />
<TextView <TextView
android:id="@+id/ndf_likes_textview" android:id="@+id/ndf_likes_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="New Text" /> android:text="New Text"
android:layout_marginLeft="10dp" />
</LinearLayout>
<ImageButton <ImageButton
android:id="@+id/ndf_delete_imagebutton" android:id="@+id/ndf_delete_imagebutton"

1
app/src/main/res/values/colors.xml
View file

@ -3,4 +3,5 @@
<color name="colorPrimary">#246068</color> <color name="colorPrimary">#246068</color>
<color name="colorPrimaryDark">#012e34</color> <color name="colorPrimaryDark">#012e34</color>
<color name="colorAccent">#ffb073</color> <color name="colorAccent">#ffb073</color>
<color name="darkGrayNote">#d1d4d7</color>
</resources> </resources>