Commit Graph

42 Commits

Author SHA1 Message Date
Sem van der Hoeven
80764591ad comment 2021-01-06 10:36:37 +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
65d2f31e3f stuff 2021-01-05 13:03:42 +01:00
Sem van der Hoeven
40331f3135 removed test route 2021-01-05 12:59:35 +01:00
Sem van der Hoeven
f5f077db0f location stuff 2021-01-05 12:13:42 +01:00
RemoMeijer
d53f63a6d7 Updated values 2021-01-05 12:02:20 +01:00
Sem van der Hoeven
e8af38981f added visualizing route 2021-01-05 11:25:13 +01:00
RemoMeijer
a75b81033f Fixed locationList 2021-01-05 10:09:24 +01:00
Sem van der Hoeven
bcd9eb6378 merge 2021-01-04 15:49:42 +01:00
RemoMeijer
678b179e04 added backbutton 2021-01-04 15:46:18 +01:00
Sem van der Hoeven
9b93ddaec5 stuff 2021-01-04 15:44:47 +01:00
RemoMeijer
1b770020ed Added List button on Home 2021-01-04 15:37:09 +01:00
Sem van der Hoeven
5e218f3b99 added getting directions for whole route 2021-01-04 15:20:24 +01:00
sebas
79e24621e2 Statistics now shows amount of coupons 2021-01-04 14:38:39 +01:00
Bart
edcfd2ff0a Added popups for coupons 2021-01-04 14:31:16 +01:00
Sem van der Hoeven
96f32ccdbc added deserialization of the api response 2021-01-04 13:50:50 +01:00
Bart
547d676a68 Coupon onClick unfinished code 2021-01-04 13:44:09 +01:00
Sem van der Hoeven
d433565fef added parsing of directions response 2021-01-04 11:42:34 +01:00
RemoMeijer
2118336815 Switching fragment from statistics to coupon works 2021-01-04 11:40:06 +01:00
sebas
91c0435e55 Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView 2021-01-04 11:06:38 +01:00
sebas
9ca3b12d71 Added code to CouponFragment 2021-01-04 11:06:04 +01:00
Bart
294814dea8 StatisticFragment navigation to CouponFragment 2021-01-04 10:59:43 +01:00
RemoMeijer
a3d8bdfd77 Merge branch 'develop' into RecyclerView
# Conflicts:
#	app/src/main/java/com/a1/nextlocation/data/Location.java
2020-12-17 14:56:15 +01:00
RemoMeijer
6f10444126 Route displays name 2020-12-17 14:48:15 +01:00
Robin Koedood
1ca13e3a6b [ADD]Locations from JSON now in app. Markers good color. No action bar. 2020-12-17 14:45:58 +01:00
RemoMeijer
1f7cd49a90 Route works and is clickable 2020-12-17 14:35:05 +01:00
Sem van der Hoeven
610b23b056 added custom overlay 2020-12-17 14:22:20 +01:00
RemoMeijer
aba26f3211 Merge branch 'develop' into RecyclerView 2020-12-17 13:55:01 +01:00
Sem van der Hoeven
95a2e4e849 made list managers load on mainactivity oncreate 2020-12-17 13:53:00 +01:00
Sem van der Hoeven
74fb4440ed made listmanagers enums 2020-12-17 13:51:45 +01:00
Bart
6c923d27b2 Connected locationFragment with recyclerview and added functionality 2020-12-17 13:46:41 +01:00
Sem van der Hoeven
17d977bb17 fixed loading 2020-12-17 13:41:20 +01:00
Sem van der Hoeven
b52c5556d2 finished loading 2020-12-17 11:50:31 +01:00
Sem van der Hoeven
512ad3980f [FIX] mapview stuff 2020-12-16 10:48:11 +01:00
Sem van der Hoeven
890a5264d6 added initmapview 2020-12-14 14:37:50 +01:00
Sem van der Hoeven
2792a62069 merge conflicts 2020-12-14 14:36:52 +01:00
Sem van der Hoeven
b3be078361 added mapview and osm map 2020-12-14 14:35:53 +01:00
Robin Koedood
19ae360ee0 [ADD] Settings fragment 2020-12-14 12:06:25 +01:00
Sem van der Hoeven
bc0c1e3a96 [ADD] all classes and packages according to class diagram 2020-12-14 10:49:10 +01:00
Sem van der Hoeven
3b6faf0672 [ADD] packages and rafactored ui classes 2020-12-14 10:42:33 +01:00