Commit Graph

81 Commits

Author SHA1 Message Date
Sem van der Hoeven
f7691d62fe added visited locations in route 2021-01-14 10:48:52 +01:00
Sem van der Hoeven
53ea394ef5 fixed locatiooooons 2021-01-14 10:28:11 +01:00
Sem van der Hoeven
158ddac964 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-12 16:40:31 +01:00
Sem van der Hoeven
43c3060f1e color change 2021-01-12 16:40:24 +01:00
RemoMeijer
de11e59db1 Fixed total distance bug 2021-01-12 16:34:27 +01:00
Bart
6edcd7b74f Total time walked gets saved and loaded 2021-01-12 15:03:46 +01:00
RemoMeijer
a7495d24ad Route displays expected time 2021-01-12 14:43:07 +01:00
Sem van der Hoeven
4cc49c77f6 yeet 2021-01-12 14:04:25 +01:00
Sem van der Hoeven
171c75c645 merge with develop 2021-01-12 13:56:46 +01:00
Sem van der Hoeven
39ff2684cb added saving route duration 2021-01-12 13:51:50 +01:00
Bart
b010de709f Saves distance, visitedNames list and displays saved info in statistics. 2021-01-12 13:30:35 +01:00
RemoMeijer
0f17e8d1e5 Added distance from current location to opend location 2021-01-12 12:18:21 +01:00
Sem van der Hoeven
e286929b77 added geofencing stuff 2021-01-12 11:12:28 +01:00
Sem van der Hoeven
c68bbd4062 ctrl alt L 2021-01-06 21:19:06 +01:00
RemoMeijer
b3f0497fba Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 21:04:06 +01:00
RemoMeijer
9da1078998 updated distance calculations 2021-01-06 21:04:03 +01:00
Sem van der Hoeven
2c7db11917 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-06 20:59:57 +01:00
Sem van der Hoeven
f062b1915c fix? 2021-01-06 20:59:48 +01:00
RemoMeijer
bbdf9a7d29 Replaced images with icons 2021-01-06 20:51:16 +01:00
Sem van der Hoeven
f3e636f586 added route calculating time 2021-01-06 20:48:45 +01:00
Bart
033052f480 Merge branch 'languages' into develop 2021-01-06 19:35:04 +01:00
Bart
8a453f298a Fixed file locating problem 2021-01-06 19:34:03 +01:00
Bart
7089524be6 Added support for different language routes and coupons 2021-01-06 17:41:57 +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
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
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
RemoMeijer
d67d78b385 Added total distance in route detail 2021-01-06 16:27:28 +01:00
Sem van der Hoeven
fb2f7e8a66 added updating time when you start a route but are already following another one 2021-01-06 16:20:03 +01:00
RemoMeijer
deb4bd5a19 Distance Calculation works, added distance test 2021-01-06 15:26:07 +01:00
Sem van der Hoeven
fcec6e1ecd stuffff 2021-01-06 14:33:25 +01:00
Sem van der Hoeven
1760f510c6 comment location 2021-01-06 13:46:08 +01:00
RemoMeijer
391792a5e2 Merge branch 'RecyclerView' into follow-route
# Conflicts:
#	app/src/main/assets/locations.json
#	app/src/main/assets/routes.json
#	app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
#	app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
#	app/src/main/res/values/strings.xml
2021-01-06 13:20:52 +01:00
Sem van der Hoeven
f5da1c8a83 added displaying all locations upon stopping the route 2021-01-06 11:33:15 +01:00
Sem van der Hoeven
f6af7ae80b added route singleton 2021-01-06 10:48:03 +01:00
RemoMeijer
d4cfa17fda Tried to add pictures in location detail 2021-01-06 10:45:00 +01:00
Sem van der Hoeven
abc58d3606 following route stuff 2021-01-06 10:41:56 +01:00
Sem van der Hoeven
1877a693d0 added boolean to singleton 2021-01-06 10:40:20 +01:00
Sem van der Hoeven
587380fd89 added updating location when you're close to it 2021-01-05 16:39:12 +01:00
Sem van der Hoeven
062739ac7b added navigation to location from map 2021-01-05 16:02:48 +01:00
Sem van der Hoeven
16bd30f785 added locations to map 2021-01-05 13:43:10 +01:00
Sem van der Hoeven
e8af38981f added visualizing route 2021-01-05 11:25:13 +01:00
Sem van der Hoeven
bcd9eb6378 merge 2021-01-04 15:49:42 +01:00
Robin Koedood
da45a0a40e [TRIED] Test FileIO class
No luck so far
2021-01-04 15:27:52 +01:00