JCE-Projects/the-social-notebook-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
165 commits 1 branch 0 tags 1.7 MiB
Commit graph

162 commits

Author SHA1 Message Date
Sagi Dayan
2eff535e7e Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-09 19:14:12 +03:00
Sagi Dayan
01aaf28247 Explore 2016-07-09 19:14:07 +03:00
Matan Bar Yosef
86352c8669 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-09 19:04:27 +03:00
Matan Bar Yosef
c6184f1b97 - filter text changed 2016-07-09 19:04:11 +03:00
Sagi Dayan
9651eba02c Fixed Personal title when coming back to the fragment 2016-07-09 18:35:06 +03:00
Sagi Dayan
7b0856e903 Settings: UI tweak 2016-07-09 18:33:38 +03:00
Sagi Dayan
f4b86eb628 Button collor in the settings 2016-07-09 18:31:43 +03:00
Sagi Dayan
f7abe47671 Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-09 18:31:06 +03:00
Sagi Dayan
1a7f177cd2 Fixed The Fucking Email Buggit push 2016-07-09 18:28:31 +03:00
Matan Bar Yosef
43c34b9316 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
 2016-07-09 18:26:49 +03:00
Matan Bar Yosef
688602529a - filters added on map and personal space 
- note view mini modified
 2016-07-09 18:20:13 +03:00
Sagi Dayan
cba527375e Cleaning 2016-07-09 17:46:18 +03:00
Sagi Dayan
681f40d2e7 Cleaned repetitive code 2016-07-09 17:38:54 +03:00
Sagi Dayan
089e2c6966 Settings Small fix 2016-07-09 04:20:56 +03:00
Sagi Dayan
c1e05033d5 Settings - Changes users password + Photo 2016-07-09 04:19:00 +03:00
Sagi Dayan
813e19632f Settings and photo upload 2016-07-09 03:12:49 +03:00
Matan Bar Yosef
c2fdbc6a22 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
 2016-07-09 02:37:58 +03:00
Aran Zaiger
92138f26bb added permissions checks and handling 2016-07-09 02:24:32 +03:00
Matan Bar Yosef
8c4b5fbd9b - note display full modified 
- added avatar image class and implemented on map on note display (personal and map views)
 2016-07-09 01:50:49 +03:00
Aran Zaiger
e72bbb3fcf fix bitmapHashMap 2016-07-08 21:29:26 +03:00
Aran Zaiger
f72c82c3e9 added like option in map 2016-07-08 16:32:29 +03:00
Aran Zaiger
c3d445c593 added delete option to user notes on map 2016-07-08 15:21:04 +03:00
Aran Zaiger
c30de5623a Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
 2016-07-08 14:49:05 +03:00
Aran Zaiger
e0a89d5149 added settings screen 
also added camera connection
 2016-07-08 14:23:13 +03:00
Aran Zaiger
bd992f1beb Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
 2016-07-08 03:21:29 +03:00
Aran Zaiger
867dc7d877 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
 2016-07-08 03:20:03 +03:00
Aran Zaiger
26c272fbe5 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
 2016-07-08 03:06:21 +03:00
Aran Zaiger
84df7e0437 changes in dialog according to ownership 
- owner will see permission and delete icon
- other wont see permission and will see like button
 2016-07-08 02:42:25 +03:00
Aran Zaiger
db003f82d7 added note ownerId 2016-07-08 02:40:10 +03:00
Sagi Dayan
7347bcb8c4 Added Utils.URLtoImageView 2016-07-08 02:35:50 +03:00
Sagi Dayan
e9da6be78d Started to tweak note_display_full.xml 2016-07-08 02:15:06 +03:00
Sagi Dayan
c2d8312f7f Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-08 02:07:31 +03:00
Aran Zaiger
4a03c1c024 added MarkerNoteStruct and dialog box for note in map 2016-07-08 02:05:58 +03:00
Sagi Dayan
f3e410a679 Nav Avater - Changes 2016-07-08 01:09:29 +03:00
Aran Zaiger
f578213520 added other users notes in map 2016-07-08 00:59:07 +03:00
Aran Zaiger
f042f9a46b added "avatar" property to Note 2016-07-08 00:58:22 +03:00
Aran Zaiger
ab578c792a Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
 2016-07-08 00:18:40 +03:00
Sagi Dayan
db3d15fa0a Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-08 00:16:51 +03:00
Aran Zaiger
6a37640637 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
 2016-07-08 00:16:47 +03:00
Aran Zaiger
f7eb10433f Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
 2016-07-08 00:16:34 +03:00
Aran Zaiger
49faa9a8e2 created Utils class 
migrated functions used all over the app to Utils
 2016-07-08 00:06:09 +03:00
Sagi Dayan
1b6e1a7eba Added Animations To List View :) 2016-07-08 00:04:46 +03:00
Sagi Dayan
2704103348 Deleted The Tags from the List View (Adapter) 2016-07-07 23:59:16 +03:00
Sagi Dayan
bae59c7332 Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-07 23:42:18 +03:00
Aran Zaiger
b263d3d9c1 added map Features 
- added zoom limitation
- added avater loading in background
- remove self marker
- added LruBitmapCache
- added getBitmapFromURL
 2016-07-07 23:42:12 +03:00
Aran Zaiger
cc40033df8 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-07 23:41:29 +03:00
Aran Zaiger
5db17a339c added map Features 
- added zoom limitation
- added avater loading in background
- remove self marker
- added LruBitmapCache
- added getBitmapFromURL
 2016-07-07 23:41:16 +03:00
Sagi Dayan
01de134c7a Created User Class. 
User is now saved on Login. and then passed as serialised String to the Class.

MainActivity Has getUser()
 2016-07-07 23:40:25 +03:00
Sagi Dayan
00f361ce79 Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-07 21:57:54 +03:00
Sagi Dayan
4921ffd9e2 Deleted Activities (Personal space) 2016-07-07 21:57:45 +03:00
Aran Zaiger
eaa66e167c added features 
- added user location to map
- added titles to fragments
- added logout option
 2016-07-06 22:41:47 +03:00
Sagi Dayan
94d5be1a07 Small Change to the menu 2016-07-06 22:19:18 +03:00
Sagi Dayan
1caf758344 Merged Arans Map Code to Master 2016-07-06 22:14:41 +03:00
Aran Zaiger
446389953b added Gmap fragment 2016-07-06 20:31:24 +03:00
Aran Zaiger
2ca5d59ee2 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	.idea/libraries/animated_vector_drawable_23_3_0.xml
#	.idea/libraries/appcompat_v7_23_3_0.xml
#	.idea/libraries/design_23_3_0.xml
#	.idea/libraries/recyclerview_v7_23_3_0.xml
#	.idea/libraries/support_annotations_23_4_0.xml
#	.idea/libraries/support_v4_23_3_0.xml
#	.idea/libraries/support_vector_drawable_23_3_0.xml
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/values/strings.xml
 2016-07-06 20:30:57 +03:00
Sagi Dayan
884e29a1ee Added automatic login - if user exists 2016-07-06 20:30:51 +03:00
Sagi Dayan
f2b53bc1eb Note List UI Tweaks 2016-07-06 19:26:13 +03:00
Sagi Dayan
219368175f Cleaned Login + Register 
Removed useless code - Minifyed + Loading spinner
 2016-07-06 17:15:16 +03:00
Sagi Dayan
d85693d54f The Big Merge - Fixed Conflicts - Needs Cleaning 2016-07-06 14:00:51 +03:00
Sagi Dayan
b6111e6b5a Getting Bundle from LoginActivity 2016-07-06 12:35:20 +03:00
Sagi Dayan
c9372616aa Changed The Ugly Icon 2016-07-05 23:47:10 +03:00
Sagi Dayan
78dad1bd11 Refine UI - Splash + Login 2016-07-05 17:39:20 +03:00
Aran Zaiger
90dfd2b2d3 fix register issue 2016-07-04 23:10:54 +03:00
Sagi Dayan
002199a076 New Style - Fixed some layout issues 2016-07-04 17:54:05 +03:00
Aran Zaiger
15fce6daa2 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	.idea/libraries/animated_vector_drawable_23_3_0.xml
#	.idea/libraries/appcompat_v7_23_3_0.xml
#	.idea/libraries/design_23_3_0.xml
#	.idea/libraries/recyclerview_v7_23_3_0.xml
#	.idea/libraries/support_annotations_23_4_0.xml
#	.idea/libraries/support_v4_23_3_0.xml
#	.idea/libraries/support_vector_drawable_23_3_0.xml
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/values/strings.xml
 2016-07-04 01:05:52 +03:00
Aran Zaiger
e1d90ed54f added map to manifest 2016-07-04 01:03:05 +03:00
Aran Zaiger
4f544308fb added skeleton for map 2016-07-04 01:01:20 +03:00
Matan Bar Yosef
5d2f040179 - add register activity and redirect to login after registration is successfully done 2016-07-03 23:25:58 +03:00
Matan Bar Yosef
d28b96a55c Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	.idea/libraries/animated_vector_drawable_23_3_0.xml
#	.idea/libraries/appcompat_v7_23_3_0.xml
#	.idea/libraries/design_23_3_0.xml
#	.idea/libraries/recyclerview_v7_23_3_0.xml
#	.idea/libraries/support_annotations_23_3_0.xml
#	.idea/libraries/support_v4_23_3_0.xml
#	.idea/libraries/support_vector_drawable_23_3_0.xml
 2016-07-03 21:55:09 +03:00
Matan Bar Yosef
039edb206d - in progress 2016-07-03 17:38:58 +03:00
Sagi Dayan
8cca1a447d Navbar experiment 2016-07-03 17:33:11 +03:00
Aran Zaiger
4dae63bb75 added delete option to note display 2016-07-03 17:24:07 +03:00
Aran Zaiger
e6af9bce68 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-03 16:41:21 +03:00
Aran Zaiger
c27d2aadf9 UI improve in Display Note 2016-07-03 16:41:11 +03:00
Matan Bar Yosef
aef9568ba6 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.idea/libraries/animated_vector_drawable_23_3_0.xml
#	.idea/libraries/appcompat_v7_23_3_0.xml
#	.idea/libraries/design_23_3_0.xml
#	.idea/libraries/recyclerview_v7_23_3_0.xml
#	.idea/libraries/support_annotations_23_3_0.xml
#	.idea/libraries/support_v4_23_3_0.xml
#	.idea/libraries/support_vector_drawable_23_3_0.xml
#	app/src/main/res/values/strings.xml
 2016-07-03 16:07:27 +03:00
Matan Bar Yosef
145fc0d76f Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/AndroidManifest.xml

- splash JPG added
 2016-07-03 15:55:10 +03:00
Sagi Dayan
90d2438cb1 Fixed Login - no Keyboard on start 2016-07-03 15:36:31 +03:00
Aran Zaiger
0817d86fce Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-03 15:26:36 +03:00
Aran Zaiger
6447da1499 added note view layout 2016-07-03 15:26:22 +03:00
Sagi Dayan
77970845cb New Login Look 2016-07-03 15:17:11 +03:00
Matan Bar Yosef
a3525d06d0 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/AndroidManifest.xml

- splash screen added and modified
 2016-07-03 14:33:02 +03:00
Aran Zaiger
52f7808a70 added limitation in adding note 2016-07-03 14:32:08 +03:00
Matan Bar Yosef
32263e8f43 - SplashScreen added 2016-07-03 13:18:23 +03:00
Sagi Dayan
f2207ce1e0 Changed Icon 2016-07-03 13:16:03 +03:00
Aran Zaiger
8c711b6cf5 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-03 12:52:10 +03:00
Aran Zaiger
89fc1fe4b3 fix to geodecoder crash 2016-07-03 12:51:51 +03:00
Matan Bar Yosef
394a32dac4 - fixed validation for null users 2016-07-02 21:21:16 +03:00
Matan Bar Yosef
c68dd0fad4 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-02 20:21:40 +03:00
Matan Bar Yosef
ba606f6ca8 - validation for login 2016-07-02 20:21:29 +03:00
Aran Zaiger
19bde85244 added runtime internet permission request 2016-07-02 20:18:19 +03:00
Aran Zaiger
995b098f65 removed delay in heavy worker 2016-07-02 19:47:45 +03:00
Aran Zaiger
a7af642aa1 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-02 19:36:59 +03:00
Matan Bar Yosef
8f5b43854f Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalSpaceActivity.java
 2016-07-02 19:36:31 +03:00
aranzaiger
5b180825b0 get all notes 
now showing all existing notes for user when entering
 2016-07-02 19:34:31 +03:00
Matan Bar Yosef
957e4e634b - login api call implemented 
- passing user id to PersonalSpaceActivity
 2016-07-02 19:27:32 +03:00
aranzaiger
7c8f56e44b Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-02 19:04:06 +03:00
aranzaiger
14ff165c20 get all notes 
now showing all existing notes for user when entering
 2016-07-02 19:03:31 +03:00
aranzaiger
87e09af1c4 new notes added to list 2016-07-02 17:49:45 +03:00
Matan Bar Yosef
fe3ffda650 - login button id bug fix 
- register button (in-progress)
 2016-07-02 17:03:47 +03:00
Matan Bar Yosef
9347065832 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-02 16:58:40 +03:00