Commit Graph

Select branches

Hide Pull Requests

ButtonFix

CosmeticFixes

Fragment

Locaitegezeik

LocationCreation

RecyclerView

Tests

bottomNavigation

couponPopup

data

develop

directions-api

display-route

follow-route

fuckcolours

geofence

helpPopup

imperial-system

languages

main

routeFragmentDetail

route_detail

saveDataMA8

#1

#2

#3

#4

#5

v1.0

v1.1

v1.2

v2.0

Mono Color

• 195377fada Fixed coupons Bart 2021-01-06 19:52:42 +01:00
• da0a919ca1 Updated the routes coordinates RemoMeijer 2021-01-06 19:52:06 +01:00
• 17c39ab63e Merge remote-tracking branch 'origin/develop' into develop Robin Koedood 2021-01-06 19:51:49 +01:00
• aa6114e257 [FIXED] tests things Robin Koedood 2021-01-06 19:51:42 +01:00
• 13cc7be1d2 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop Sem van der Hoeven 2021-01-06 19:49:19 +01:00
• 611427b0d2 more coupons Sem van der Hoeven 2021-01-06 19:49:12 +01:00
• e3fc976f5f Updated the nl locations coordinates RemoMeijer 2021-01-06 19:46:05 +01:00
• f01f4fbdfa [FIXED] CouponFragment test with string resource Robin Koedood 2021-01-06 19:43:21 +01:00
• 16bb984deb Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop Sem van der Hoeven 2021-01-06 19:42:07 +01:00
• 9828595e8b proper context Sem van der Hoeven 2021-01-06 19:42:04 +01:00
• 5062a9fa67 Updated coordinates again RemoMeijer 2021-01-06 19:40:38 +01:00
• 033052f480 Merge branch 'languages' into develop Bart 2021-01-06 19:35:04 +01:00
• 564eb597c6 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop Sem van der Hoeven 2021-01-06 19:34:29 +01:00
• 6fed07ca41 update routes with locations and imageurls Sem van der Hoeven 2021-01-06 19:34:22 +01:00
• 8a453f298a Fixed file locating problem languages Bart 2021-01-06 19:34:03 +01:00
• 615401c0d3 Commented settingsFragment sebas 2021-01-06 19:31:01 +01:00
• a4413ca42c Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop RemoMeijer 2021-01-06 19:29:03 +01:00
• c3d317baea Added even more comments RemoMeijer 2021-01-06 19:29:00 +01:00
• 4d00735f24 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop Sem van der Hoeven 2021-01-06 19:25:15 +01:00
• c2bf1d762a added findbyname in locationlistmanager Sem van der Hoeven 2021-01-06 19:25:10 +01:00
• 5f3fcf2889 Added comments RemoMeijer 2021-01-06 19:25:04 +01:00
• 4021f9903d Removed custOverlay, Added comments RemoMeijer 2021-01-06 19:24:51 +01:00
• e9a889fe6d Merge remote-tracking branch 'origin/develop' into develop Robin Koedood 2021-01-06 19:19:58 +01:00
• 5f927a5550 [FIXED] Test works again Robin Koedood 2021-01-06 19:19:54 +01:00
• ae2aab7275 Added comments RemoMeijer 2021-01-06 19:18:23 +01:00
• 0d94d17b2f [REMOVED] Color blind Robin Koedood 2021-01-06 19:17:21 +01:00
• 56a14c2482 Fixed the bottomNavigation refresh when a route is started Bart 2021-01-06 18:31:55 +01:00
• 7089524be6 Added support for different language routes and coupons Bart 2021-01-06 17:41:57 +01:00
• f868302d30 [UPDATED] CouponFragment test with string values Robin Koedood 2021-01-06 17:41:25 +01:00
• 08b0ca191b [UPDATED] Name of button Robin Koedood 2021-01-06 17:39:16 +01:00
• ebde0c5815 [UPDATED] DataTest Robin Koedood 2021-01-06 17:34:32 +01:00
• aeb676e594 Merge branch 'helpPopup' into develop Sem van der Hoeven 2021-01-06 17:21:44 +01:00
• cfeb2bc64e merge languages Sem van der Hoeven 2021-01-06 17:20:38 +01:00
• 3df8d36e89 Merge branch 'route_detail' into develop Sem van der Hoeven 2021-01-06 17:18:02 +01:00
• 93ededb3d1 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route Sem van der Hoeven 2021-01-06 17:16:33 +01:00
• 91670fb6f3 rename staticdata to data Sem van der Hoeven 2021-01-06 17:16:19 +01:00
• b2c320dd14 [UPDATED] Route Test follow-route Robin Koedood 2021-01-06 17:12:52 +01:00
• ce264d78bc rename Sem van der Hoeven 2021-01-06 17:09:11 +01:00
• f8acc35c5b Merge remote-tracking branch 'origin/follow-route' into follow-route Robin Koedood 2021-01-06 17:07:47 +01:00
• e5e0916555 [ADD] Static Data Test Robin Koedood 2021-01-06 17:07:26 +01:00
• c738deab23 commentssssssssssssssssssssss Sem van der Hoeven 2021-01-06 17:06:27 +01:00
• 223e77cdc8 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route Sem van der Hoeven 2021-01-06 16:57:08 +01:00
• 7c9dc07c3d added keeping zoom level Sem van der Hoeven 2021-01-06 16:56:57 +01:00
• 187f45b770 Merge remote-tracking branch 'origin/follow-route' into follow-route Robin Koedood 2021-01-06 16:56:21 +01:00
• 04487b77a7 [ADD] RouteHandler Test Robin Koedood 2021-01-06 16:56:16 +01:00
• c921a76dc4 Added route picture, text and total distance in routeDetail route_detail RemoMeijer 2021-01-06 16:54:15 +01:00
• 5844445555 Updated English location.json Bart 2021-01-06 16:53:17 +01:00
• d67d78b385 Added total distance in route detail RemoMeijer 2021-01-06 16:27:28 +01:00
• 0ea7ee6c31 locations.json is now English Bart 2021-01-06 16:21:01 +01:00
• d6a6724ba0 HelpPopup klaar. Tekst veranderd naar wit en extra zin toegevoegd over locaties ingedrukt houden. Layout is veranderd naar constraintlayout helpPopup Bipin 2021-01-06 16:20:10 +01:00
• fb2f7e8a66 added updating time when you start a route but are already following another one Sem van der Hoeven 2021-01-06 16:20:03 +01:00
• c412f36e6c moved sections into own methods Sem van der Hoeven 2021-01-06 16:09:00 +01:00
• 7dc5ce098c Layout fix Bipin 2021-01-06 16:07:45 +01:00
• 98a1ad799c Location loader now loads the correct location.json according to the selected language Bart 2021-01-06 16:03:59 +01:00
• 2d9dfe9c0e updated coords RemoMeijer 2021-01-06 15:53:02 +01:00
• b31ba7023e Updated coordinates RemoMeijer 2021-01-06 15:50:43 +01:00
• 7ba87b71b0 added time Sem van der Hoeven 2021-01-06 15:44:14 +01:00
• edfc125427 added icon Sem van der Hoeven 2021-01-06 15:37:10 +01:00
• f5a2eabf61 Added popup functionality Bart 2021-01-06 15:35:16 +01:00
• 6d3a092298 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route Sem van der Hoeven 2021-01-06 15:32:35 +01:00
• 15608bed2b added icon to drawable Sem van der Hoeven 2021-01-06 15:32:25 +01:00
• deb4bd5a19 Distance Calculation works, added distance test RemoMeijer 2021-01-06 15:26:07 +01:00
• 05c8951f2c Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route Sem van der Hoeven 2021-01-06 15:25:36 +01:00
• a27ebfc0c3 added stopping route if last location has been reached Sem van der Hoeven 2021-01-06 14:40:30 +01:00
• dabe3cfb99 moved Refreshable to package Fragment Bart 2021-01-06 14:35:54 +01:00
• f806015963 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route Sem van der Hoeven 2021-01-06 14:33:38 +01:00
• fcec6e1ecd stuffff Sem van der Hoeven 2021-01-06 14:33:25 +01:00
• 7284b66c13 Merge branch 'languages' into follow-route Bart 2021-01-06 14:26:39 +01:00
• 6266705c3e fix clusterfuck? Sem van der Hoeven 2021-01-06 14:18:37 +01:00
• e90582b539 stuff merge iewl Sem van der Hoeven 2021-01-06 14:12:59 +01:00
• 1db6d03da7 [ADD] Extra route and locations description Tests Robin Koedood 2021-01-06 14:07:19 +01:00
• 68f2855a66 added locations back Sem van der Hoeven 2021-01-06 14:07:19 +01:00
• d018b83490 added strings Bart 2021-01-06 14:04:37 +01:00
• 1aee93cd0c mergeeee Sem van der Hoeven 2021-01-06 13:59:59 +01:00
• 216f48cc0f fixed distance Sem van der Hoeven 2021-01-06 13:57:00 +01:00
• 8a758f1d8d [ADD] Start Route button from other branch Robin Koedood 2021-01-06 13:55:20 +01:00
• bd623a3f1d stuff Sem van der Hoeven 2021-01-06 13:54:30 +01:00
• 1760f510c6 comment location Sem van der Hoeven 2021-01-06 13:46:08 +01:00
• ba9569b5a8 Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route Sem van der Hoeven 2021-01-06 13:45:53 +01:00
• ca8d291262 [CHANGED] String values Robin Koedood 2021-01-06 13:44:17 +01:00
• 98eeba4de1 comments Sem van der Hoeven 2021-01-06 13:42:26 +01:00
• f0ef9512a0 Merge remote-tracking branch 'origin/RecyclerView' into Tests Robin Koedood 2021-01-06 13:32:22 +01:00
• f0f87af42b Merge branch 'follow-route' into RecyclerView RecyclerView sebas 2021-01-06 13:23:58 +01:00
• 192f1a4c64 Route detail fragment now fills in the right name and text sebas 2021-01-06 13:22:37 +01:00
• 391792a5e2 Merge branch 'RecyclerView' into follow-route RemoMeijer 2021-01-06 13:20:52 +01:00
• 1cf973da9b bottom navigation sets locale on startup and language change. Fixed a bug where the selected fragment changes when rotated. Bart 2021-01-06 12:21:31 +01:00
• 21c479076d Merge remote-tracking branch 'origin/follow-route' into Tests Robin Koedood 2021-01-06 12:10:05 +01:00
• 0ed16ee069 [CHANGED] String values Robin Koedood 2021-01-06 12:08:25 +01:00
• 1f53890a4b added comments Sem van der Hoeven 2021-01-06 12:08:18 +01:00
• 09ced99654 Added route RemoMeijer 2021-01-06 11:59:45 +01:00
• 86bc0f0c19 Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView sebas 2021-01-06 11:56:14 +01:00
• deb599db25 Font now changes according to last change when starting application, added scrollView to location detail, location detail now takes location name and description and added 2 discriptions to location.json sebas 2021-01-06 11:54:39 +01:00
• 9be5ba27ab Added descriptions on all locations RemoMeijer 2021-01-06 11:47:14 +01:00
• 926a984c71 stop icon Sem van der Hoeven 2021-01-06 11:33:35 +01:00
• f5da1c8a83 added displaying all locations upon stopping the route Sem van der Hoeven 2021-01-06 11:33:15 +01:00
• 525d4b776d Merge remote-tracking branch 'origin/develop' into Tests Robin Koedood 2021-01-06 11:14:19 +01:00
• 0e63bff0f1 Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView sebas 2021-01-06 11:13:16 +01:00
• 5e76ced998 Location detail now displays images sebas 2021-01-06 11:12:33 +01:00
• da2a9e43bc Merge remote-tracking branch 'origin/Tests' into Tests Robin Koedood 2021-01-06 10:50:18 +01:00
• 3d1cfd244b [ADD] Main Activity Test Robin Koedood 2021-01-06 10:50:14 +01:00