Commit graph

75 commits

Author SHA1 Message Date
Sagi Dayan 1009fe2467 Black like button + less threads 2016-07-10 15:35:41 +03:00
Matan Bar Yosef 0c2e3f852b Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 15:23:54 +03:00
Matan Bar Yosef de79c90836 - unlike icon added 2016-07-10 15:23:36 +03:00
Sagi Dayan fe6306af75 Movin fragment container to the proper place 2016-07-10 15:16:11 +03:00
Aran Zaiger 2462975975 updated filters view on all screens 2016-07-10 14:02:13 +03:00
Sagi Dayan e7565ce98b New Note UI Fixes 2016-07-10 13:11:12 +03:00
Matan Bar Yosef b360b4a1b7 - title not displaying on note_view_full bug fixed
- note_view_full title text color changed to black
2016-07-09 22:20:25 +03:00
Matan Bar Yosef db4af0dc2e - filters added on explore mode 2016-07-09 21:21:12 +03:00
Matan Bar Yosef ce683b3191 - note_view_full modified 2016-07-09 21:03:16 +03:00
Matan Bar Yosef 9ffd24c101 - trash icon position fixed
- layout note_display_full modified
2016-07-09 20:47:33 +03:00
Matan Bar Yosef 9a7680c489 - filters do not take space anymore when they are invisible 2016-07-09 20:00:20 +03:00
Matan Bar Yosef 1f866ae494 - fragment_explore list align 2016-07-09 19:47:39 +03:00
Matan Bar Yosef 4fe2a0ab51 - note_display_full width bug fixed 2016-07-09 19:33:05 +03:00
Sagi Dayan 01aaf28247 Explore 2016-07-09 19:14:07 +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 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
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 c3d445c593 added delete option to user notes on map 2016-07-08 15:21:04 +03:00
Aran Zaiger e0a89d5149 added settings screen
also added camera connection
2016-07-08 14:23:13 +03:00
Sagi Dayan e9da6be78d Started to tweak note_display_full.xml 2016-07-08 02:15:06 +03:00
Sagi Dayan f3e410a679 Nav Avater - Changes 2016-07-08 01:09:29 +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 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 4921ffd9e2 Deleted Activities (Personal space) 2016-07-07 21:57:45 +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 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 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
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 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