4eb721fb1a
button add rm manual quick fix
2018-11-22 12:41:44 +01:00
marcin.jedynski
2b4e2d3b99
merge v2
2018-11-21 08:46:06 +01:00
Mieszko Wrzeszczyński
b75e3e5ae3
Improve logging
2018-11-21 08:37:23 +01:00
Mieszko Wrzeszczyński
18841ab372
Merge branch 'develop' into approximated-localizations
2018-11-21 08:13:19 +01:00
Mieszko Wrzeszczyński
fce151be6f
Change endpoint for users
2018-11-21 08:11:48 +01:00
marcin.jedynski
b8eedc565c
hiden tutor portion of drawer if student logged in
2018-11-21 04:59:50 +01:00
marcin.jedynski
f2357c846e
merge
2018-11-21 04:38:36 +01:00
marcin.jedynski
8c9eb2c706
filled strings with polish names
2018-11-21 04:23:22 +01:00
marcin.jedynski
662b8c29c4
predefined status service linked to backend
2018-11-21 03:38:53 +01:00
ffcc68c107
markers resizing
2018-11-21 00:43:42 +01:00
549c2f6484
small modifs
2018-11-21 00:27:22 +01:00
66de4ffa1d
...
2018-11-21 00:14:25 +01:00
86cafe1d5a
Merge branch 'mapManualLocation' into tmp20nov
2018-11-20 23:58:35 +01:00
Mieszko Wrzeszczyński
688341e072
Remove crosshair from map
2018-11-20 23:46:38 +01:00
Mieszko Wrzeszczyński
8a29b93533
Revert to LDAP login
2018-11-20 23:23:44 +01:00
70001e36c3
cancel button improved
...
handle runnable for tmp sending manual location
2018-11-20 22:56:30 +01:00
Mieszko Wrzeszczyński
157855d911
Merge with dev
2018-11-20 22:44:38 +01:00
Mieszko Wrzeszczyński
b02ec917ed
Add markers filter
2018-11-20 22:29:07 +01:00
marcin.jedynski
d62c451adb
button choose from map redirects to mapActivity
2018-11-20 15:26:42 +01:00
Mieszko Wrzeszczyński
892216cc0c
Fix search button
2018-11-20 00:19:17 +01:00
Mieszko Wrzeszczyński
50a427313f
Improve user search
2018-11-20 00:08:18 +01:00
e1496ce65c
Merge branch 'approximated-localizations' into mapManualLocation
2018-11-19 22:19:01 +01:00
Mieszko Wrzeszczyński
d5114a8587
Add presence mode
2018-11-19 11:49:28 +01:00
Mieszko Wrzeszczyński
aa3c2eb9b8
Send middle of polygon in approximated mode
2018-11-19 00:03:31 +01:00
marcin.jedynski
1acac4edc4
sharing tab redesigned
2018-11-18 16:26:59 +01:00
marcin.jedynski
e0973ca732
manual merge to develop
2018-11-18 02:10:25 +01:00
marcin.jedynski
5dad15f135
removed unused imports from baseactivity
2018-11-18 01:58:17 +01:00
marcin.jedynski
e664e00212
refactor, moved code from baseactivity to feedbackutils class
2018-11-18 01:53:07 +01:00
49f47986f0
recon my own marker
2018-11-17 19:56:57 +01:00
bb4831ec89
typo
2018-11-17 17:47:36 +01:00
c04373a59c
manual location fixing
2018-11-17 17:46:27 +01:00
fd9cb37fb3
bound area improvment, toggle bounding box in menu fab
2018-11-17 16:30:52 +01:00
8669e040b5
adjusted modals for feedback/bug
2018-11-13 23:59:39 +01:00
f89971d059
added feedback model and service, added sending feedback
2018-11-13 12:16:01 +01:00
8083b67fc4
code refractor - moved boundries method into mapUtils
2018-11-12 19:26:41 +01:00
bca8cb782b
Map bound area for WMI added
2018-11-12 16:13:56 +01:00
c9b4548f45
added modal asking for user data for bug/feedback report
2018-11-12 00:51:35 +01:00
1323c02b30
added code for sending email
2018-11-11 19:55:17 +01:00
9f23aae620
added bug icon to resources
2018-11-11 15:54:35 +01:00
35311af645
added string values and options to drawer
2018-11-11 15:31:11 +01:00
b64280bf3f
1st alpha release
2018-11-10 18:35:53 +01:00
Mieszko Wrzeszczyński
77b7c50e4e
Add approximated localization
2018-11-09 00:50:15 +01:00
Mieszko Wrzeszczyński
64b24cef1b
Add approximated localizations
2018-11-09 00:49:09 +01:00
Mieszko Wrzeszczyński
98cc5bcc20
Merge branch 'develop' into developToMapPravilnie
2018-11-07 08:51:12 +01:00
Mieszko Wrzeszczyński
505e890f8b
Add custom status & change userName
2018-11-07 08:45:09 +01:00
5d595c4c65
if statemnt added in case of empty
2018-11-07 00:28:19 +01:00
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
5f65d8e6fb
marker removing
2018-11-06 23:51:46 +01:00
Mieszko Wrzeszczyński
1094ef942b
Add FusedLocalizationApi
2018-11-06 23:50:13 +01:00
Mieszko Wrzeszczyński
b23d82d74d
Merge from develop & add label to coordinate on map
2018-11-06 10:30:27 +01:00
5757a58edf
adjusted background task and shared pref file to work together throught PrefUtils
2018-11-06 03:04:17 +01:00
Mieszko Wrzeszczyński
583305ff31
Add modal on marker click
2018-11-05 23:25:29 +01:00
Mieszko Wrzeszczyński
03235ce18b
Handle properly background task life cycle
2018-11-05 10:37:25 +01:00
Mieszko Wrzeszczyński
03c38a8f23
Fix permissions
2018-11-05 10:04:32 +01:00
8ca2f7dc31
button view gone
2018-11-05 01:22:09 +01:00
90074affb1
* markerks fix
2018-11-05 00:29:49 +01:00
61f94c7beb
clean up
...
* animated marker onTap removed,
* bg loc function removed
* todos updated
2018-11-04 18:15:54 +01:00
2b53506651
ready to test and PR to develop
2018-11-04 13:24:45 +01:00
1e40b77205
Merge branch 'develop' into developToMapPravilnie
2018-11-04 13:05:32 +01:00
40101ef7d0
a
2018-11-04 12:39:57 +01:00
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
Mieszko Wrzeszczyński
64256d2d67
Update login validation
2018-11-03 16:15:55 +01:00
Mieszko Wrzeszczyński
8553b934a6
hot fix
2018-11-03 16:02:01 +01:00
Mieszko Wrzeszczyński
afbf736e63
Add working language switcher
2018-11-03 15:02:44 +01:00
Mieszko Wrzeszczyński
d8cf220293
Improve UI of userlist
2018-11-03 11:21:52 +01:00
8a0ccfa60a
custom markers, gitignore for ds store noobish mac files
2018-11-03 01:31:39 +01:00
f57141d0f2
diff colors of markers added,
...
manual loc select without api connection
2018-11-03 01:26:46 +01:00
Mieszko Wrzeszczyński
05e4de95c2
Run in thread
2018-11-02 23:21:01 +01:00
Mieszko Wrzeszczyński
78957bb62b
Add stop and start possibility to background task
2018-11-02 21:46:05 +01:00
Mieszko Wrzeszczyński
484f1a2114
Resolve merge from develop
2018-11-02 17:59:28 +01:00
Mieszko Wrzeszczyński
e4b33da25b
Refactor before merge to develop
2018-11-02 17:31:35 +01:00
Mieszko Wrzeszczyński
44b84fef0e
Improve searching
2018-11-02 16:08:11 +01:00
Mieszko Wrzeszczyński
aa3dbfb185
Add search to list
2018-11-02 15:45:18 +01:00
Mieszko Wrzeszczyński
ca24cc5437
Add possibility to login with ldap login and password
2018-11-02 11:42:56 +01:00
Marcin Jedyński
27c92af38d
merge commit
2018-11-02 02:42:00 +01:00
Marcin Jedyński
7019864b9a
fixed comments
2018-11-02 02:05:02 +01:00
Marcin Jedyński
45c78e64c0
added logo and changed icons in drawer
2018-11-02 01:45:25 +01:00
Mieszko Wrzeszczyński
5fa0fbe38e
Fix creating coordinates service
2018-11-01 21:34:00 +01:00
Mieszko Wrzeszczyński
eff4802c9d
Add more extensive error logging
2018-11-01 21:01:26 +01:00
340e41bc01
drawables for lower apis
2018-11-01 20:51:12 +01:00
d023f0aea5
quick fix
2018-11-01 20:41:16 +01:00
d090893044
select loc butt
2018-11-01 20:38:52 +01:00
Mieszko Wrzeszczyński
7191fcf6e7
Fix loginActivity - there is possibility to use ordinary validate endpoint
2018-11-01 20:37:51 +01:00
1ae9217819
MapActivity clean up, mapUtils created
2018-11-01 20:19:50 +01:00
fe13bee1f5
Colors + strings added
...
FloatingMenu with buttons ready to connect with layers
2018-10-31 22:24:26 +01:00
c67d4ba4c8
Animated markers, need to customize behavior on newTimeStamp
2018-10-31 01:13:05 +01:00
Mieszko Wrzeszczyński
d6710a5406
Rewrite activity to fragment
2018-10-30 23:55:21 +01:00
2d9e041b6b
clean up
2018-10-30 20:25:16 +01:00
b7b7f8a6a1
ds store deleted
...
mainasctivity
listview adapter
2018-10-30 20:24:53 +01:00
2a79537fbe
rdy to develop
2018-10-30 19:35:40 +01:00
9a2054deb2
shit commit
2018-10-30 19:22:35 +01:00
Mieszko Wrzeszczyński
f5edf67c15
Working activity without bottom navigation
2018-10-30 19:03:20 +01:00
9aca72bdfe
replace changed to put
2018-10-30 18:24:16 +01:00
Marcin Jedyński
d879258266
removed floating log out
2018-10-28 23:02:05 +01:00
Marcin Jedyński
b0cfda8548
fixed drawer
2018-10-28 22:58:53 +01:00
d2405d36f6
finall clean up - ready to merge develop
2018-10-28 21:56:40 +01:00
2c81359665
rm unused activities and layouts
2018-10-28 19:58:15 +01:00
Mieszko Wrzeszczyński
d4aa5b5261
Refactor & don't show user information when tutor tab does not exist
2018-10-28 17:40:16 +01:00
Mieszko Wrzeszczyński
4701387d48
Add duty hours to user information modal
2018-10-28 12:18:49 +01:00
Mieszko Wrzeszczyński
299e25d0f9
Add primitive modal about user
2018-10-27 23:58:51 +02:00
Mieszko Wrzeszczyński
edd5fb76a3
A little refactor of user modal
2018-10-26 23:54:18 +02:00
Mieszko Wrzeszczyński
b87646088c
Add modal with more comprehensive information about specific user
2018-10-26 23:50:03 +02:00
Mieszko Wrzeszczyński
1e281b3ea5
Add status of particular user
2018-10-26 23:29:45 +02:00
Mieszko Wrzeszczyński
49199ccc44
Add badgers
2018-10-26 21:52:19 +02:00
b1af9f6798
code cleanup cont
2018-10-26 20:41:36 +02:00
Mieszko Wrzeszczyński
c7231bc70a
Sort users by online category
2018-10-26 20:08:52 +02:00
Mieszko Wrzeszczyński
31f7408ea6
get all tutors
2018-10-26 14:04:52 +02:00
Mieszko Wrzeszczyński
aa6810a633
Working user list
2018-10-26 13:57:50 +02:00
5dab4eaf4b
bottom navi with frags and activities
2018-10-25 00:19:12 +02:00
Domagalski
d60a3c413c
fragment with background
2018-10-22 01:01:06 +02:00
Domagalski
091b714b18
working Markers with mixed adapter view and fragment layout
2018-10-20 18:09:28 +02:00
Mieszko Wrzeszczyński
95978dad72
Fix executing timer
2018-10-20 15:18:40 +02:00
Domagalski
2b4b83a0d2
we going back
2018-10-20 11:54:41 +02:00
Domagalski
2568b03197
logout button
2018-10-20 10:45:34 +02:00
Domagalski
61e5faa81b
logout button
2018-10-18 09:03:48 +02:00
Domagalski
9162c7fd34
animacja markera, + stary zostaje
2018-10-18 01:46:36 +02:00
Domagalski
dc0af04e5d
startp activity change
2018-10-17 23:07:58 +02:00
Domagalski
f60bac1c3c
animated markers with some issues
2018-10-17 01:24:24 +02:00
Mieszko Wrzeszczyński
10c3397949
Merge branch 'develop' of s416084/find-my-tutor-android into sharing-tab-rest
2018-10-14 10:47:20 +00:00
Mieszko Wrzeszczyński
e9c4aef12c
Improve background-task & fetch user profile after logging
2018-10-14 12:46:33 +02:00
Domagalski
82f0ecd2b0
Merge branch 'mapBoxs' into mapBoxsToDevelop
2018-10-13 22:42:57 +02:00
Mieszko Wrzeszczyński
5511e5b40e
Fix logging
2018-10-13 14:23:10 +02:00
Marcin Jedyński
fa519cf312
adjusted for merge
2018-10-12 02:25:26 +02:00
Marcin Jedyński
5cabcde90b
reversed changes on startup activity
2018-10-12 02:02:57 +02:00
Marcin Jedyński
c765ac0782
added overriding status/location list when manual entry added
2018-10-12 01:57:24 +02:00
Mieszko Wrzeszczyński
2948ff7db9
Merge background-task into develop
2018-10-11 22:43:12 +02:00
Mieszko Wrzeszczyński
2ebbe42d50
Resolve merge conflicts
2018-10-11 21:17:56 +02:00
Mieszko Wrzeszczyński
850d588744
A little refactor before merge to develop
2018-10-11 20:57:57 +02:00
b87f859d75
updated strings
2018-10-11 12:54:52 +02:00
a98a500f08
added layout file for sharing tab
2018-10-11 12:53:50 +02:00
Marcin Jedyński
c78757da65
work in progress, splited activity into two, sharing tab and settings
2018-10-10 09:35:31 +02:00
Domagalski
ebb228fdec
elo
2018-10-10 01:09:09 +02:00
Domagalski
fcff6463bf
top coords
2018-10-09 23:55:46 +02:00
Mieszko Wrzeszczyński
ae5c8d91e2
Add support for android O
2018-10-09 21:33:44 +02:00
Mieszko Wrzeszczyński
6d6db2efe0
Add working background task in Android 6 (API 23)
2018-10-09 21:17:51 +02:00
Mieszko Wrzeszczyński
1773b09aa3
Fix bug connected to empty localization afer start up
2018-10-07 20:32:17 +02:00
Mieszko Wrzeszczyński
db689b569e
Merge with prev version
2018-10-07 15:56:08 +02:00
Mieszko Wrzeszczyński
72252ebf87
Rollback to the first attempt with GoogleService
2018-10-07 15:51:37 +02:00
Mieszko Wrzeszczyński
182e3e473e
Kill backgrund task on logout
2018-10-06 20:12:07 +02:00
Mieszko Wrzeszczyński
136806adfd
Send real data from service && a little refactor
2018-09-30 22:56:53 +02:00
Domagalski
92c1892501
fragments rewritten into activities, all menus in BaseActivity, need to clean up the code and remove unused components
2018-09-30 21:55:32 +02:00
Mieszko Wrzeszczyński
35af6aa70e
Rewrite AsyncTask to rxjava-retrofit approach
2018-09-30 18:58:30 +02:00
Mieszko Wrzeszczyński
5d7022a32c
Send localization frombackground task to backend
2018-09-30 14:03:16 +02:00
Domagalski
997765ddb5
login fixed
2018-09-30 13:33:29 +02:00
Domagalski
89ef83033b
mapbox default method lifcycle
2018-09-30 12:15:26 +02:00
Mieszko Wrzeszczyński
3cb54cceec
Remove stop background Service method from MainActivity
2018-09-30 11:14:53 +02:00
Domagalski
64c594174a
bottom nav with activities
2018-09-30 10:34:32 +02:00
Mieszko Wrzeszczyński
c9bb9cbf95
Fix logging of background task
2018-09-30 10:06:20 +02:00
Mieszko Wrzeszczyński
b591587e6a
Add broadcast receiver
2018-09-29 17:36:36 +02:00
Mieszko Wrzeszczyński
c73325dd4e
Fix permissions issue
2018-09-28 21:24:14 +02:00
Marcin Jedyński
4bbd4f65db
fixed typo
2018-09-28 02:47:39 +02:00
Marcin Jedyński
d294f97a49
added activity for setting preferences, also added polish translations for strings used in preferences
2018-09-28 02:42:43 +02:00
Domagalski
883b2ef7db
to be conitnued...
2018-09-28 01:33:29 +02:00
Domagalski
45cc04a072
added icons, strings
2018-09-25 16:40:08 +02:00
Domagalski
170050406c
search toolbar added, need to connect with API
2018-09-23 14:10:01 +02:00
Domagalski
9ca1617e29
code clean up, removed unnecessary .xml elements, rebuild MainActivity structure, chop onCreate to particular functions
2018-09-20 22:51:19 +02:00
355c78de5d
Add background task
2018-09-19 23:24:10 +02:00
62814aaa54
Add google background service
2018-09-19 21:46:15 +02:00
Domagalski
ad58983d32
added navigation drawer\'(left side menu\')
2018-09-18 23:53:16 +02:00
c2a4f13769
Initial build
2018-09-15 19:38:58 +02:00
7072ecfe59
fixed switiching between fragments
2018-09-13 16:49:43 +02:00
Marcin Jedyński
6bfdc768a3
added different layouts for each role, also removed tabs changing colours
2018-09-13 01:41:38 +02:00
Marcin Jedyński
460f3f6520
Merge branch 'feature/login-role-switch' of s416084/find-my-tutor-android into bottomNaviWithFrags
2018-09-04 17:19:30 +00:00
Marcin Jedyński
3bd289424a
added simple switch to login layout and passed it's vale down to fake validate endpoint
2018-09-04 00:34:02 +02:00
Domagalski
7907211934
bottom navi with 3 fragments, moved mapbox to map fragment and integraded with bottom navbar
2018-09-04 00:01:35 +02:00
e36eb8bf0d
Change login and whole API handling to rxjava
2018-08-30 10:04:37 +02:00
Domagalski
56b472887c
Code clean up, removed nasty code, 2 classes that we won't need for now, Logout button added, Polish translation added
2018-08-26 22:28:59 +02:00
c97f892eab
Fix login
2018-08-26 19:38:55 +02:00
Marcin Jedyński
5b2dfff4dd
merged from feature/user-service
2018-08-26 17:01:38 +02:00
Marcin Jedyński
9c17221e65
removed token from arg list v2
2018-08-26 16:32:01 +02:00
Marcin Jedyński
6dcad78524
removed token from arg list
2018-08-26 16:30:19 +02:00
Marcin Jedyński
4510b887cc
fixed response type for post methods
2018-08-26 16:19:04 +02:00
68eec30ecd
Remove unnecessary headers from service
2018-08-26 13:17:43 +02:00
5eea1133b9
Refactor of service
2018-08-26 13:11:20 +02:00
5116828ca3
Add JWT authorization
2018-08-26 13:09:43 +02:00
5dc11c6fec
Add models and coordinates service
2018-08-25 20:26:17 +02:00
Marcin Jedyński
53a9b1ea2e
v1 of userService and models
2018-08-25 06:50:28 +02:00
Domagalski
ad27db1a47
Integraded retrofit, created LdapService with api endpoints.
...
LdapUser + JwtToken models.
Getting proper jwt token after fakeValidate - now need to implement it on login and save in SharedPreferences(localstorage)
2018-08-21 23:41:07 +02:00
Domagalski
e7db60071a
login screen with SharedPref (for jwt localstroage), loggedIn check, Startup Actibity, Login Activity adn MainActivity.
2018-08-15 22:27:46 +02:00
Adam Domagalski
marcin.jedynski
Mieszko Wrzeszczyński
Domagalski