Commit Graph

126 Commits

Author SHA1 Message Date
Bipin
7f56cbe30a Button be working now 2021-01-12 13:58:41 +01:00
Robin Koedood
4c09192f9a YEP 2021-01-12 12:09:30 +01:00
Robin Koedood
8740362553 Auto stash before merge of "fuckcolours" and "origin/fuckcolours" 2021-01-12 12:05:27 +01:00
Bipin
0663dabca5 Some non-functional changes 2021-01-12 11:54:33 +01:00
Bipin
cf650f6cf4 colourFix 2021-01-12 10:18:04 +01:00
Sem van der Hoeven
38dbbfc534 fiiiix 2021-01-07 11:43:40 +01:00
Sem van der Hoeven
8169e8c680 added back diff line 2021-01-07 11:35:44 +01:00
Sem van der Hoeven
20431d019b Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-07 11:20:58 +01:00
Sem van der Hoeven
7e99070002 added ok button to help popup 2021-01-07 11:20:48 +01:00
SemvdH
01e7cb5fdf Merge branch 'develop' into imperial-system 2021-01-06 23:20:13 +01:00
Bart
c98acaf7c0 Added support for imperial units 2021-01-06 22:27:59 +01:00
Sem van der Hoeven
c68bbd4062 ctrl alt L 2021-01-06 21:19:06 +01:00
Sem van der Hoeven
7d833c8ec5 fix 2.0 2021-01-06 21:04:21 +01:00
Bart
5f11d58300 Updated default language dropdown position (en -> nl) 2021-01-06 20:46:21 +01:00
Bart
22d760bbda Updated language, removed chinese from language dropdown 2021-01-06 20:10:27 +01:00
Sem van der Hoeven
9828595e8b proper context 2021-01-06 19:42:04 +01:00
Sem van der Hoeven
564eb597c6 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 19:34:29 +01:00
Sem van der Hoeven
6fed07ca41 update routes with locations and imageurls 2021-01-06 19:34:22 +01:00
sebas
615401c0d3 Commented settingsFragment 2021-01-06 19:31:01 +01:00
Sem van der Hoeven
4d00735f24 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 19:25:15 +01:00
Sem van der Hoeven
c2bf1d762a added findbyname in locationlistmanager 2021-01-06 19:25:10 +01:00
RemoMeijer
5f3fcf2889 Added comments 2021-01-06 19:25:04 +01:00
RemoMeijer
ae2aab7275 Added comments 2021-01-06 19:18:23 +01:00
Bart
56a14c2482 Fixed the bottomNavigation refresh when a route is started 2021-01-06 18:31:55 +01:00
Sem van der Hoeven
aeb676e594 Merge branch 'helpPopup' into develop 2021-01-06 17:21:44 +01:00
Sem van der Hoeven
3df8d36e89 Merge branch 'route_detail' into develop 2021-01-06 17:18:02 +01:00
Sem van der Hoeven
91670fb6f3 rename staticdata to data 2021-01-06 17:16:19 +01:00
Robin Koedood
f8acc35c5b Merge remote-tracking branch 'origin/follow-route' into follow-route 2021-01-06 17:07:47 +01:00
Robin Koedood
e5e0916555 [ADD] Static Data Test 2021-01-06 17:07:26 +01:00
Sem van der Hoeven
c738deab23 commentssssssssssssssssssssss 2021-01-06 17:06:27 +01:00
Sem van der Hoeven
223e77cdc8 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route 2021-01-06 16:57:08 +01:00
Sem van der Hoeven
7c9dc07c3d added keeping zoom level 2021-01-06 16:56:57 +01:00
RemoMeijer
c921a76dc4 Added route picture, text and total distance in routeDetail 2021-01-06 16:54:15 +01:00
RemoMeijer
d67d78b385 Added total distance in route detail 2021-01-06 16:27:28 +01:00
Sem van der Hoeven
7ba87b71b0 added time 2021-01-06 15:44:14 +01:00
Bart
f5a2eabf61 Added popup functionality 2021-01-06 15:35:16 +01:00
Sem van der Hoeven
6d3a092298 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route 2021-01-06 15:32:35 +01:00
Sem van der Hoeven
15608bed2b added icon to drawable 2021-01-06 15:32:25 +01:00
RemoMeijer
deb4bd5a19 Distance Calculation works, added distance test 2021-01-06 15:26:07 +01:00
Sem van der Hoeven
05c8951f2c Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route 2021-01-06 15:25:36 +01:00
Sem van der Hoeven
a27ebfc0c3 added stopping route if last location has been reached 2021-01-06 14:40:30 +01:00
Bart
dabe3cfb99 moved Refreshable to package Fragment 2021-01-06 14:35:54 +01:00
Sem van der Hoeven
f806015963 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route 2021-01-06 14:33:38 +01:00
Sem van der Hoeven
fcec6e1ecd stuffff 2021-01-06 14:33:25 +01:00
Bart
7284b66c13 Merge branch 'languages' into follow-route 2021-01-06 14:26:39 +01:00
Sem van der Hoeven
6266705c3e fix clusterfuck? 2021-01-06 14:18:37 +01:00
Sem van der Hoeven
e90582b539 stuff merge iewl 2021-01-06 14:12:59 +01:00
Bart
d018b83490 added strings 2021-01-06 14:04:37 +01:00
Sem van der Hoeven
1aee93cd0c mergeeee 2021-01-06 13:59:59 +01:00
Sem van der Hoeven
216f48cc0f fixed distance 2021-01-06 13:57:00 +01:00