Commit Graph

331 Commits

Author SHA1 Message Date
0182d2e041 Merge branch 'develop' into bg-task-increase-interval 2018-12-06 22:00:04 +01:00
d9909a66bd Adjust to develop 2018-12-06 21:59:37 +01:00
0cec17dd16 Create handlers for coming in and out from building 2018-12-06 21:32:13 +01:00
b4dd785504 map ico info in progress 2018-12-06 00:57:53 +01:00
57702fd3a1 Merge branch 'develop' into fix-fetching-coords-in-map 2018-12-05 23:39:04 +01:00
381373b4b7 Fetch markers only when screen is on 2018-12-05 23:38:13 +01:00
0dd0b0dc23 added some translation and removed throwing error for testing 2018-12-05 22:45:11 +01:00
d1adf451a0 Merge branch 'develop' into acraReporter 2018-12-05 21:26:12 +01:00
7fb1d90ab7 Increase build version 2018-12-05 14:22:04 +01:00
f0f1e59947 Fix default value 2018-12-05 14:17:34 +01:00
2ca64a66ba Rollback ssl config 2018-12-05 12:25:31 +01:00
b2e5a0e0c5 Fix unknown location 2018-12-05 09:59:18 +01:00
5e51be5d0b First attempt 2018-12-05 00:45:16 +01:00
5fc5140866 Merge branch 'improve-user-modal' of s416084/find-my-tutor-android into develop 2018-12-04 21:23:09 +00:00
76c3ba5054 Change app icon 2018-12-04 22:18:16 +01:00
Adam Domagalski
e3e88d168f eliptic curve cipher TLS change for android 7 nougat 2018-12-03 16:00:35 +01:00
6115958efb Add Lato font & improve user modal 2018-12-02 22:15:39 +01:00
Adam Domagalski
f3f2f3b90a acra wtih intented crash on manual loc select 2018-12-02 21:29:47 +01:00
ee6d11fe44 Improve colors & margins 2018-12-02 16:28:20 +01:00
c05d03a4d0 Fix partially manual predefined locations 2018-12-01 11:49:27 +01:00
a52e5dd89b Increase version 2018-11-29 22:34:31 +01:00
79d48bb269 Fix BG & markers filter & boundaries 2018-11-29 22:31:47 +01:00
f6cfb7f352 Version to deploy 2018-11-29 12:15:58 +01:00
1e07168725 adjuested feedback model 2018-11-28 18:37:48 +01:00
d7bc56f5f9 adjust code to master 2018-11-28 09:37:38 +01:00
c452e5dbf5 Fix BG & UI 2018-11-27 20:53:01 +01:00
ab74f0b7e1 Fix manual pop up windows 2018-11-27 19:52:36 +01:00
Adam Domagalski
66dba76ed4 istutor bugifx map 2018-11-27 16:12:02 +01:00
Marcin Jedynski
e96981c8b9 fixed post update tutortab 2018-11-27 14:51:55 +01:00
Marcin Jedynski
c43aabf739 added save/fetch functionality to tutortab 2018-11-27 13:03:45 +01:00
6dbe50761a Fix retrofit rxjava 2018-11-27 11:45:50 +01:00
2b19229552 added icons, translations, renamed activites in manifest 2018-11-27 11:40:02 +01:00
abbd887db7 added basic layout and fetching of profile activity, but save note not implemented yet, got some problems 2018-11-27 06:51:49 +01:00
50ef5b1e8b merge 2018-11-27 06:21:19 +01:00
bbc7803177 added handling of choosing manual location from list in sharing tab 2018-11-27 03:10:33 +01:00
012f2af3f2 Fix login 2018-11-27 00:26:43 +01:00
789a2dbaf1 Merge from dev 2018-11-27 00:16:36 +01:00
ba67a8b088 Add predifined 2018-11-27 00:00:37 +01:00
Adam Domagalski
64082727b2 static marker bug removal 2018-11-26 23:54:12 +01:00
Adam Domagalski
9b291117ef temporary timestamp check for removing marker 2018-11-26 23:04:35 +01:00
493395d36a moved manualLocation logic from MapActivity to ManualLocationUtils 2018-11-26 20:54:54 +01:00
3a2c4f10d4 Improve marker browser 2018-11-26 20:22:04 +01:00
854ddadeea fixed switching location mode, adding custom status, and switching on location service when choosing manual location from map tab 2018-11-26 16:21:29 +01:00
35ba11129c added fake validate 2018-11-26 13:02:38 +01:00
Adam Domagalski
ffff4bb7c0 green locs bug fixed 2018-11-26 09:13:27 +01:00
Adam Domagalski
da944c37d5 manual location connected to sharing tab and uses bg task for sending cors 2018-11-26 00:46:36 +01:00
f0df7b7440 Add proper markers icons 2018-11-25 22:27:57 +01:00
aef7174d90 Add new markers 2018-11-24 00:11:06 +01:00
422b1079da Change icon when user change localization level 2018-11-23 23:36:04 +01:00
73fc5f9b0b Add default icon for each type of localization 2018-11-23 22:27:59 +01:00
Adam Domagalski
ac27fc3f34 alpha3 without dev fucnitons 2018-11-22 13:39:48 +01:00
fca6cd936c Merge branch 'mapManualLocation' of s416084/find-my-tutor-android into develop 2018-11-22 11:45:13 +00:00
Adam Domagalski
4eb721fb1a button add rm manual quick fix 2018-11-22 12:41:44 +01:00
2b4e2d3b99 merge v2 2018-11-21 08:46:06 +01:00
b75e3e5ae3 Improve logging 2018-11-21 08:37:23 +01:00
18841ab372 Merge branch 'develop' into approximated-localizations 2018-11-21 08:13:19 +01:00
fce151be6f Change endpoint for users 2018-11-21 08:11:48 +01:00
b8eedc565c hiden tutor portion of drawer if student logged in 2018-11-21 04:59:50 +01:00
f2357c846e merge 2018-11-21 04:38:36 +01:00
8c9eb2c706 filled strings with polish names 2018-11-21 04:23:22 +01:00
662b8c29c4 predefined status service linked to backend 2018-11-21 03:38:53 +01:00
Adam Domagalski
ffcc68c107 markers resizing 2018-11-21 00:43:42 +01:00
Adam Domagalski
549c2f6484 small modifs 2018-11-21 00:27:22 +01:00
Adam Domagalski
66de4ffa1d ... 2018-11-21 00:14:25 +01:00
Adam Domagalski
86cafe1d5a Merge branch 'mapManualLocation' into tmp20nov 2018-11-20 23:58:35 +01:00
688341e072 Remove crosshair from map 2018-11-20 23:46:38 +01:00
8a29b93533 Revert to LDAP login 2018-11-20 23:23:44 +01:00
Adam Domagalski
70001e36c3 cancel button improved
handle runnable for tmp sending manual location
2018-11-20 22:56:30 +01:00
157855d911 Merge with dev 2018-11-20 22:44:38 +01:00
b02ec917ed Add markers filter 2018-11-20 22:29:07 +01:00
d62c451adb button choose from map redirects to mapActivity 2018-11-20 15:26:42 +01:00
892216cc0c Fix search button 2018-11-20 00:19:17 +01:00
50a427313f Improve user search 2018-11-20 00:08:18 +01:00
Adam Domagalski
e1496ce65c Merge branch 'approximated-localizations' into mapManualLocation 2018-11-19 22:19:01 +01:00
d5114a8587 Add presence mode 2018-11-19 11:49:28 +01:00
aa3c2eb9b8 Send middle of polygon in approximated mode 2018-11-19 00:03:31 +01:00
1acac4edc4 sharing tab redesigned 2018-11-18 16:26:59 +01:00
e0973ca732 manual merge to develop 2018-11-18 02:10:25 +01:00
5dad15f135 removed unused imports from baseactivity 2018-11-18 01:58:17 +01:00
e664e00212 refactor, moved code from baseactivity to feedbackutils class 2018-11-18 01:53:07 +01:00
Adam Domagalski
49f47986f0 recon my own marker 2018-11-17 19:56:57 +01:00
Adam Domagalski
bb4831ec89 typo 2018-11-17 17:47:36 +01:00
Adam Domagalski
c04373a59c manual location fixing 2018-11-17 17:46:27 +01:00
Adam Domagalski
fd9cb37fb3 bound area improvment, toggle bounding box in menu fab 2018-11-17 16:30:52 +01:00
Marcin Jedynski
8669e040b5 adjusted modals for feedback/bug 2018-11-13 23:59:39 +01:00
Marcin Jedynski
f89971d059 added feedback model and service, added sending feedback 2018-11-13 12:16:01 +01:00
Adam Domagalski
8083b67fc4 code refractor - moved boundries method into mapUtils 2018-11-12 19:26:41 +01:00
Adam Domagalski
bca8cb782b Map bound area for WMI added 2018-11-12 16:13:56 +01:00
Marcin Jedynski
c9b4548f45 added modal asking for user data for bug/feedback report 2018-11-12 00:51:35 +01:00
Marcin Jedynski
1323c02b30 added code for sending email 2018-11-11 19:55:17 +01:00
Marcin Jedynski
9f23aae620 added bug icon to resources 2018-11-11 15:54:35 +01:00
Marcin Jedynski
35311af645 added string values and options to drawer 2018-11-11 15:31:11 +01:00
Adam Domagalski
b64280bf3f 1st alpha release 2018-11-10 18:35:53 +01:00
77b7c50e4e Add approximated localization 2018-11-09 00:50:15 +01:00
64b24cef1b Add approximated localizations 2018-11-09 00:49:09 +01:00
98cc5bcc20 Merge branch 'develop' into developToMapPravilnie 2018-11-07 08:51:12 +01:00
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
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
b23d82d74d Merge from develop & add label to coordinate on map 2018-11-06 10:30:27 +01: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
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
64256d2d67 Update login validation 2018-11-03 16:15:55 +01:00
8553b934a6 hot fix 2018-11-03 16:02:01 +01:00
afbf736e63 Add working language switcher 2018-11-03 15:02:44 +01: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
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
ca24cc5437 Add possibility to login with ldap login and password 2018-11-02 11:42:56 +01: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
Adam Domagalski
fe13bee1f5 Colors + strings added
FloatingMenu with buttons ready to connect with layers
2018-10-31 22:24:26 +01:00
Adam Domagalski
c67d4ba4c8 Animated markers, need to customize behavior on newTimeStamp 2018-10-31 01:13:05 +01:00
d6710a5406 Rewrite activity to fragment 2018-10-30 23:55:21 +01:00
Adam Domagalski
2d9e041b6b clean up 2018-10-30 20:25:16 +01:00
Adam Domagalski
b7b7f8a6a1 ds store deleted
mainasctivity
listview adapter
2018-10-30 20:24:53 +01:00
Adam Domagalski
2a79537fbe rdy to develop 2018-10-30 19:35:40 +01:00
Adam Domagalski
9a2054deb2 shit commit 2018-10-30 19:22:35 +01:00
f5edf67c15 Working activity without bottom navigation 2018-10-30 19:03:20 +01:00
Adam Domagalski
9aca72bdfe replace changed to put 2018-10-30 18:24:16 +01:00
d879258266 removed floating log out 2018-10-28 23:02:05 +01:00
b0cfda8548 fixed drawer 2018-10-28 22:58:53 +01:00
Adam Domagalski
d2405d36f6 finall clean up - ready to merge develop 2018-10-28 21:56:40 +01:00
Adam Domagalski
2c81359665 rm unused activities and layouts 2018-10-28 19:58:15 +01:00
d4aa5b5261 Refactor & don't show user information when tutor tab does not exist 2018-10-28 17:40:16 +01:00