Commit Graph

456 Commits

Author SHA1 Message Date
505e890f8b Add custom status & change userName 2018-11-07 08:45:09 +01:00
Adam Domagalski
5d595c4c65 if statemnt added in case of empty 2018-11-07 00:28:19 +01:00
Adam Domagalski
295be86eee Merge branch 'develop' into developToMapPravilnie 2018-11-07 00:01:41 +01:00
Adam Domagalski
9cd0f053e3 Merge branch 'developToMapPravilnie' of git.wmi.amu.edu.pl:s416084/find-my-tutor-android into developToMapPravilnie 2018-11-07 00:00:23 +01:00
Adam Domagalski
5f65d8e6fb marker removing 2018-11-06 23:51:46 +01:00
1094ef942b Add FusedLocalizationApi 2018-11-06 23:50:13 +01:00
c62b901c10 Merge branch 'developToMapPravilnie' of s416084/find-my-tutor-android into develop 2018-11-06 09:35:38 +00:00
b23d82d74d Merge from develop & add label to coordinate on map 2018-11-06 10:30:27 +01:00
ba4e097f86 Merge branch 'attachedSharingTabToBacgroundTask' of s416084/find-my-tutor-android into develop 2018-11-06 02:06:56 +00:00
Marcin Jedynski
5757a58edf adjusted background task and shared pref file to work together throught PrefUtils 2018-11-06 03:04:17 +01:00
583305ff31 Add modal on marker click 2018-11-05 23:25:29 +01:00
03235ce18b Handle properly background task life cycle 2018-11-05 10:37:25 +01:00
03c38a8f23 Fix permissions 2018-11-05 10:04:32 +01:00
Adam Domagalski
8ca2f7dc31 button view gone 2018-11-05 01:22:09 +01:00
Adam Domagalski
90074affb1 * markerks fix 2018-11-05 00:29:49 +01:00
98ee8d1a21 Merge branch 'developToMapPravilnie' of s416084/find-my-tutor-android into develop 2018-11-04 17:25:16 +00:00
Adam Domagalski
61f94c7beb clean up
* animated marker onTap removed,
* bg loc function removed
* todos updated
2018-11-04 18:15:54 +01:00
Adam Domagalski
2b53506651 ready to test and PR to develop 2018-11-04 13:24:45 +01:00
Adam Domagalski
1e40b77205 Merge branch 'develop' into developToMapPravilnie 2018-11-04 13:05:32 +01:00
Adam Domagalski
40101ef7d0 a 2018-11-04 12:39:57 +01:00
Adam Domagalski
cad9f466c2 * location centre button with nice animation
* location accuracyArea and direction indicator
* POST on manual selection
* removing markers after 5mins
2018-11-04 01:37:57 +01:00
7189193dac Merge branch 'fix-android-permissions' of s416084/find-my-tutor-android into develop 2018-11-03 15:16:38 +00:00
64256d2d67 Update login validation 2018-11-03 16:15:55 +01:00
8553b934a6 hot fix 2018-11-03 16:02:01 +01:00
2c61d22db7 Merge branch 'multilangual-version' of s416084/find-my-tutor-android into develop 2018-11-03 14:03:45 +00:00
afbf736e63 Add working language switcher 2018-11-03 15:02:44 +01:00
d2b5fbf35d Merge branch 'shared-settings-handle-background-task' of s416084/find-my-tutor-android into develop 2018-11-03 10:23:23 +00:00
d8cf220293 Improve UI of userlist 2018-11-03 11:21:52 +01:00
Adam Domagalski
8a0ccfa60a custom markers, gitignore for ds store noobish mac files 2018-11-03 01:31:39 +01:00
Adam Domagalski
f57141d0f2 diff colors of markers added,
manual loc select without api connection
2018-11-03 01:26:46 +01:00
05e4de95c2 Run in thread 2018-11-02 23:21:01 +01:00
78957bb62b Add stop and start possibility to background task 2018-11-02 21:46:05 +01:00
bf694594e4 Merge branch 'tutors-list-activity' of s416084/find-my-tutor-android into develop 2018-11-02 17:00:23 +00:00
484f1a2114 Resolve merge from develop 2018-11-02 17:59:28 +01:00
e4b33da25b Refactor before merge to develop 2018-11-02 17:31:35 +01:00
44b84fef0e Improve searching 2018-11-02 16:08:11 +01:00
aa3dbfb185 Add search to list 2018-11-02 15:45:18 +01:00
b21aff1ef0 Merge branch 'logging-activity-ldap' of s416084/find-my-tutor-android into develop 2018-11-02 10:44:41 +00:00
ca24cc5437 Add possibility to login with ldap login and password 2018-11-02 11:42:56 +01:00
b1dfb6611d Merge branch 'fixedDrawerNavigation' of s416084/find-my-tutor-android into develop 2018-11-02 01:42:26 +00:00
27c92af38d merge commit 2018-11-02 02:42:00 +01:00
7019864b9a fixed comments 2018-11-02 02:05:02 +01:00
45c78e64c0 added logo and changed icons in drawer 2018-11-02 01:45:25 +01:00
5fa0fbe38e Fix creating coordinates service 2018-11-01 21:34:00 +01:00
eff4802c9d Add more extensive error logging 2018-11-01 21:01:26 +01:00
Adam Domagalski
340e41bc01 drawables for lower apis 2018-11-01 20:51:12 +01:00
Adam Domagalski
d023f0aea5 quick fix 2018-11-01 20:41:16 +01:00
Adam Domagalski
d090893044 select loc butt 2018-11-01 20:38:52 +01:00
7191fcf6e7 Fix loginActivity - there is possibility to use ordinary validate endpoint 2018-11-01 20:37:51 +01:00
Adam Domagalski
1ae9217819 MapActivity clean up, mapUtils created 2018-11-01 20:19:50 +01:00