|
|
1de4b0a2ab
|
Merge branch 'settingsActivity' of s416084/find-my-tutor-android into develop
|
2018-10-12 00:26:28 +00:00 |
|
|
|
fa519cf312
|
adjusted for merge
|
2018-10-12 02:25:26 +02:00 |
|
|
|
5cabcde90b
|
reversed changes on startup activity
|
2018-10-12 02:02:57 +02:00 |
|
|
|
c765ac0782
|
added overriding status/location list when manual entry added
|
2018-10-12 01:57:24 +02:00 |
|
|
|
d35262843a
|
Merge branch 'background-to-merge' of s416084/find-my-tutor-android into develop
|
2018-10-11 22:12:34 +00:00 |
|
|
|
2948ff7db9
|
Merge background-task into develop
|
2018-10-11 22:43:12 +02:00 |
|
|
|
2ebbe42d50
|
Resolve merge conflicts
|
2018-10-11 21:17:56 +02:00 |
|
|
|
850d588744
|
A little refactor before merge to develop
|
2018-10-11 20:57:57 +02:00 |
|
Marcin Jedynski
|
b87f859d75
|
updated strings
|
2018-10-11 12:54:52 +02:00 |
|
Marcin Jedynski
|
a98a500f08
|
added layout file for sharing tab
|
2018-10-11 12:53:50 +02:00 |
|
|
|
c78757da65
|
work in progress, splited activity into two, sharing tab and settings
|
2018-10-10 09:35:31 +02:00 |
|
|
|
ae5c8d91e2
|
Add support for android O
|
2018-10-09 21:33:44 +02:00 |
|
|
|
6d6db2efe0
|
Add working background task in Android 6 (API 23)
|
2018-10-09 21:17:51 +02:00 |
|
|
|
1773b09aa3
|
Fix bug connected to empty localization afer start up
|
2018-10-07 20:32:17 +02:00 |
|
|
|
db689b569e
|
Merge with prev version
|
2018-10-07 15:56:08 +02:00 |
|
|
|
72252ebf87
|
Rollback to the first attempt with GoogleService
|
2018-10-07 15:51:37 +02:00 |
|
|
|
182e3e473e
|
Kill backgrund task on logout
|
2018-10-06 20:12:07 +02:00 |
|
|
|
136806adfd
|
Send real data from service && a little refactor
|
2018-09-30 22:56:53 +02:00 |
|
|
|
35af6aa70e
|
Rewrite AsyncTask to rxjava-retrofit approach
|
2018-09-30 18:58:30 +02:00 |
|
|
|
5d7022a32c
|
Send localization frombackground task to backend
|
2018-09-30 14:03:16 +02:00 |
|
|
|
3cb54cceec
|
Remove stop background Service method from MainActivity
|
2018-09-30 11:14:53 +02:00 |
|
|
|
c9bb9cbf95
|
Fix logging of background task
|
2018-09-30 10:06:20 +02:00 |
|
|
|
b591587e6a
|
Add broadcast receiver
|
2018-09-29 17:36:36 +02:00 |
|
|
|
c73325dd4e
|
Fix permissions issue
|
2018-09-28 21:24:14 +02:00 |
|
|
|
4bbd4f65db
|
fixed typo
|
2018-09-28 02:47:39 +02:00 |
|
|
|
d294f97a49
|
added activity for setting preferences, also added polish translations for strings used in preferences
|
2018-09-28 02:42:43 +02:00 |
|
|
|
02db1722a2
|
Merge branch 'navDrawerAndTopToolbar' of s416084/find-my-tutor-android into develop
|
2018-09-25 20:56:36 +00:00 |
|
|
|
45cc04a072
|
added icons, strings
|
2018-09-25 16:40:08 +02:00 |
|
|
|
170050406c
|
search toolbar added, need to connect with API
|
2018-09-23 14:10:01 +02:00 |
|
|
|
9ca1617e29
|
code clean up, removed unnecessary .xml elements, rebuild MainActivity structure, chop onCreate to particular functions
|
2018-09-20 22:51:19 +02:00 |
|
Mieszko
|
355c78de5d
|
Add background task
|
2018-09-19 23:24:10 +02:00 |
|
Mieszko
|
62814aaa54
|
Add google background service
|
2018-09-19 21:46:15 +02:00 |
|
|
|
ad58983d32
|
added navigation drawer\'(left side menu\')
|
2018-09-18 23:53:16 +02:00 |
|
Mieszko
|
c2a4f13769
|
Initial build
|
2018-09-15 19:38:58 +02:00 |
|
|
|
2f802ad64f
|
Merge branch 'feature/roleDependentLayout' of s416084/find-my-tutor-android into develop
|
2018-09-13 16:15:27 +00:00 |
|
Marcin Jedynski
|
7072ecfe59
|
fixed switiching between fragments
|
2018-09-13 16:49:43 +02:00 |
|
|
|
6bfdc768a3
|
added different layouts for each role, also removed tabs changing colours
|
2018-09-13 01:41:38 +02:00 |
|
|
|
3ab11592d4
|
Merge branch 'bottomNaviWithFrags' of s416084/find-my-tutor-android into develop
|
2018-09-04 17:23:26 +00:00 |
|
|
|
460f3f6520
|
Merge branch 'feature/login-role-switch' of s416084/find-my-tutor-android into bottomNaviWithFrags
|
2018-09-04 17:19:30 +00:00 |
|
|
|
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 |
|
|
|
7907211934
|
bottom navi with 3 fragments, moved mapbox to map fragment and integraded with bottom navbar
|
2018-09-04 00:01:35 +02:00 |
|
Mieszko
|
e36eb8bf0d
|
Change login and whole API handling to rxjava
|
2018-08-30 10:04:37 +02:00 |
|
|
|
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 |
|
Mieszko
|
c97f892eab
|
Fix login
|
2018-08-26 19:38:55 +02:00 |
|
|
|
5b2dfff4dd
|
merged from feature/user-service
|
2018-08-26 17:01:38 +02:00 |
|
|
|
9c17221e65
|
removed token from arg list v2
|
2018-08-26 16:32:01 +02:00 |
|
|
|
6dcad78524
|
removed token from arg list
|
2018-08-26 16:30:19 +02:00 |
|
|
|
4510b887cc
|
fixed response type for post methods
|
2018-08-26 16:19:04 +02:00 |
|
Mieszko
|
68eec30ecd
|
Remove unnecessary headers from service
|
2018-08-26 13:17:43 +02:00 |
|
Mieszko
|
5eea1133b9
|
Refactor of service
|
2018-08-26 13:11:20 +02:00 |
|
