Commit graph

18 commits

Author SHA1 Message Date
Aran Zaiger e0a89d5149 added settings screen
also added camera connection
2016-07-08 14:23:13 +03:00
Sagi Dayan 7347bcb8c4 Added Utils.URLtoImageView 2016-07-08 02:35:50 +03:00
Sagi Dayan f3e410a679 Nav Avater - Changes 2016-07-08 01:09:29 +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 bae59c7332 Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-07 23:42:18 +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
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 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 b6111e6b5a Getting Bundle from LoginActivity 2016-07-06 12:35:20 +03:00
Sagi Dayan 002199a076 New Style - Fixed some layout issues 2016-07-04 17:54:05 +03:00
Sagi Dayan 8cca1a447d Navbar experiment 2016-07-03 17:33:11 +03:00