Commit Graph

372 Commits

Author SHA1 Message Date
7a41dcbb1f Merge branch 'fix-manula-bg' of s416084/find-my-tutor-android into develop 2019-01-06 22:46:12 +00:00
4bb9452cbc Fix blacklists 2019-01-06 23:45:47 +01:00
8da6ca8c0d fixed padding 2019-01-06 23:40:28 +01:00
3e7e77a430 revered sharing tab UI disabling to wait for api response, minor fix 2019-01-06 22:55:36 +01:00
2d93b23197 revered sharing tab UI disabling to wait for api response 2019-01-06 22:54:01 +01:00
66fa45baa0 Fix BG handle 2019-01-06 22:47:03 +01:00
51dcefcc62 Merge branch 'develop' into newProfile 2019-01-06 20:56:57 +01:00
489901dca1 added timepicker, email validation, new UI 2019-01-06 20:56:01 +01:00
8ab7e526e6 Merge branch 'fix-pref-sharing' of s416084/find-my-tutor-android into develop 2019-01-06 17:58:56 +00:00
bca6885591 Fix right button preferences 2019-01-06 18:52:14 +01:00
fac7ae0fdf bottom nav focus fixed 2019-01-06 15:36:49 +01:00
3b4bb9cbae Fix sharing buttons 2019-01-06 11:58:22 +01:00
9a96f474d9 Increase build version 2019-01-05 20:28:43 +01:00
e4b0bb1f3d Fix networks issues 2019-01-05 20:22:34 +01:00
9525d47600 Fix 2019-01-05 15:52:56 +01:00
25e8d42ee0 Fix imports 2019-01-05 08:22:48 +01:00
eb4147557b Merge branch 'addRemovingManuals' of s416084/find-my-tutor-android into develop 2019-01-04 23:45:41 +00:00
da018120f1 Update gradle 2019-01-05 00:35:52 +01:00
dfc30c3790 Merge branch 'develop' into improve-rx-java-blacklists 2019-01-05 00:12:52 +01:00
46cdaa8ef9 Add wrapper override 2019-01-05 00:12:33 +01:00
cb1e7bcdef Convert multiple api calls to flatMap with rxJava 2019-01-04 21:05:23 +01:00
5db5d2f8e0 Merge branch 'showOnMap' of s416084/find-my-tutor-android into develop 2019-01-04 13:03:57 +00:00
ec29191342 tutor tap show on map and status indicator 2019-01-04 13:58:04 +01:00
35ef25b2b7 Extend history 2019-01-04 11:11:55 +01:00
9e32a909d9 merge develop 2019-01-04 08:46:20 +01:00
bc6e5179c7 minor adjustments 2019-01-04 03:48:16 +01:00
8a88629b9a managed hiding/disabling preferences depending on contents of response from api 2019-01-04 03:04:26 +01:00
39d2d78ad8 Update gradle 2019-01-03 23:58:03 +01:00
4fceb4195f Fix blacklists 2019-01-03 23:41:24 +01:00
7d1460353d Merge branch 'develop' into add-slider 2019-01-03 23:02:18 +01:00
f9226262ed Fix UI whitelist 2019-01-03 23:01:55 +01:00
a0934638b3 toast and icon changed 2019-01-03 22:17:30 +01:00
0147a83034 Merge branch 'develop' into add-slider 2019-01-03 21:57:56 +01:00
81af3360f7 Add slider 2019-01-03 21:57:23 +01:00
2338e484f8 Merge confict 2019-01-03 21:53:15 +01:00
1eed752b1a Merge branch 'develop' into blackNwhiteLists 2019-01-03 21:47:50 +01:00
af1e1a53b4 Add proper search 2019-01-03 21:32:28 +01:00
3a6f20d12e strings fixes and toast removed 2019-01-03 21:30:43 +01:00
d9ada9319b white list finished, toogle on/off related to blacklsits 2019-01-03 21:07:32 +01:00
8e94d86968 Fix corner case 2019-01-03 20:03:46 +01:00
b81e28cd61 Fix online logic 2019-01-03 19:51:48 +01:00
8bcecbbed5 Change online trigger 2019-01-03 19:50:11 +01:00
ea0d6e1e96 Add save battery mode 2019-01-03 19:34:55 +01:00
88f263217a Use fused and change loc mode 2019-01-03 17:39:34 +01:00
a4fd031a36 resolved case when selected entries are deleted, working towards enabling/disabling views when there are no items 2019-01-03 10:38:58 +01:00
94368b05d1 deleting works, needs some polishing like refreshing summaries and hiding buttons depending on the level of sharing 2019-01-03 02:12:17 +01:00
Maciej Wanat
b323939067 Text fixes 2019-01-02 19:16:04 +01:00
44e392c027 Add search on backend 2019-01-02 18:23:03 +01:00
9059cbd01d Fix online icon 2019-01-02 17:42:10 +01:00
aec9eaae19 string fixes 2019-01-02 12:21:05 +01:00