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 |
|