376 Commits

Author SHA1 Message Date
Bart
195377fada Fixed coupons
Locating wrong json
2021-01-06 19:52:42 +01:00
RemoMeijer
da0a919ca1 Updated the routes coordinates 2021-01-06 19:52:06 +01:00
Robin Koedood
17c39ab63e Merge remote-tracking branch 'origin/develop' into develop 2021-01-06 19:51:49 +01:00
Robin Koedood
aa6114e257 [FIXED] tests things 2021-01-06 19:51:42 +01:00
Sem van der Hoeven
13cc7be1d2 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 19:49:19 +01:00
Sem van der Hoeven
611427b0d2 more coupons 2021-01-06 19:49:12 +01:00
RemoMeijer
e3fc976f5f Updated the nl locations coordinates 2021-01-06 19:46:05 +01:00
Robin Koedood
f01f4fbdfa [FIXED] CouponFragment test with string resource 2021-01-06 19:43:21 +01:00
Sem van der Hoeven
16bb984deb Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 19:42:07 +01:00
Sem van der Hoeven
9828595e8b proper context 2021-01-06 19:42:04 +01:00
RemoMeijer
5062a9fa67 Updated coordinates again 2021-01-06 19:40:38 +01:00
Bart
033052f480 Merge branch 'languages' into develop 2021-01-06 19:35: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
Bart
8a453f298a Fixed file locating problem 2021-01-06 19:34:03 +01:00
sebas
615401c0d3 Commented settingsFragment 2021-01-06 19:31:01 +01:00
RemoMeijer
a4413ca42c Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 19:29:03 +01:00
RemoMeijer
c3d317baea Added even more comments 2021-01-06 19:29:00 +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
4021f9903d Removed custOverlay, Added comments 2021-01-06 19:24:51 +01:00
Robin Koedood
e9a889fe6d Merge remote-tracking branch 'origin/develop' into develop 2021-01-06 19:19:58 +01:00
Robin Koedood
5f927a5550 [FIXED] Test works again 2021-01-06 19:19:54 +01:00
RemoMeijer
ae2aab7275 Added comments 2021-01-06 19:18:23 +01:00
Robin Koedood
0d94d17b2f [REMOVED] Color blind 2021-01-06 19:17:21 +01:00
Bart
56a14c2482 Fixed the bottomNavigation refresh when a route is started 2021-01-06 18:31:55 +01:00
Bart
7089524be6 Added support for different language routes and coupons 2021-01-06 17:41:57 +01:00
Robin Koedood
f868302d30 [UPDATED] CouponFragment test with string values 2021-01-06 17:41:37 +01:00
Robin Koedood
08b0ca191b [UPDATED] Name of button 2021-01-06 17:39:16 +01:00
Robin Koedood
ebde0c5815 [UPDATED] DataTest 2021-01-06 17:34:32 +01:00
Sem van der Hoeven
aeb676e594 Merge branch 'helpPopup' into develop 2021-01-06 17:21:44 +01:00
Sem van der Hoeven
cfeb2bc64e merge languages 2021-01-06 17:20:38 +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
93ededb3d1 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route 2021-01-06 17:16:33 +01:00
Sem van der Hoeven
91670fb6f3 rename staticdata to data 2021-01-06 17:16:19 +01:00
Robin Koedood
b2c320dd14 [UPDATED] Route Test 2021-01-06 17:12:52 +01:00
Sem van der Hoeven
ce264d78bc rename 2021-01-06 17:09:11 +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
Robin Koedood
187f45b770 Merge remote-tracking branch 'origin/follow-route' into follow-route 2021-01-06 16:56:21 +01:00
Robin Koedood
04487b77a7 [ADD] RouteHandler Test 2021-01-06 16:56:16 +01:00
RemoMeijer
c921a76dc4 Added route picture, text and total distance in routeDetail 2021-01-06 16:54:15 +01:00
Bart
5844445555 Updated English location.json 2021-01-06 16:53:17 +01:00
RemoMeijer
d67d78b385 Added total distance in route detail 2021-01-06 16:27:28 +01:00
Bart
0ea7ee6c31 locations.json is now English 2021-01-06 16:21:01 +01:00
Bipin
d6a6724ba0 HelpPopup klaar. Tekst veranderd naar wit en extra zin toegevoegd over locaties ingedrukt houden. Layout is veranderd naar constraintlayout 2021-01-06 16:20:10 +01:00