SemvdH
|
01e7cb5fdf
|
Merge branch 'develop' into imperial-system
|
2021-01-06 23:20:13 +01:00 |
|
Bart
|
c98acaf7c0
|
Added support for imperial units
|
2021-01-06 22:27:59 +01:00 |
|
Sem van der Hoeven
|
c68bbd4062
|
ctrl alt L
|
2021-01-06 21:19:06 +01:00 |
|
Sem van der Hoeven
|
7d833c8ec5
|
fix 2.0
|
2021-01-06 21:04:21 +01:00 |
|
RemoMeijer
|
5f3fcf2889
|
Added comments
|
2021-01-06 19:25:04 +01:00 |
|
Sem van der Hoeven
|
91670fb6f3
|
rename staticdata to data
|
2021-01-06 17:16:19 +01:00 |
|
Robin Koedood
|
e5e0916555
|
[ADD] Static Data Test
|
2021-01-06 17:07:26 +01:00 |
|
Sem van der Hoeven
|
7ba87b71b0
|
added time
|
2021-01-06 15:44:14 +01:00 |
|
Sem van der Hoeven
|
fcec6e1ecd
|
stuffff
|
2021-01-06 14:33:25 +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
|
587380fd89
|
added updating location when you're close to it
|
2021-01-05 16:39:12 +01:00 |
|
RemoMeijer
|
2e5f57aa23
|
Added coupon arrow
|
2021-01-05 13:32:28 +01:00 |
|
RemoMeijer
|
fbf8cbe1c5
|
Small fix
|
2021-01-05 13:23:48 +01:00 |
|
RemoMeijer
|
aae67f53ec
|
Statistics button works
|
2021-01-05 13:18:25 +01:00 |
|
RemoMeijer
|
1b770020ed
|
Added List button on Home
|
2021-01-04 15:37:09 +01:00 |
|
sebas
|
79e24621e2
|
Statistics now shows amount of coupons
|
2021-01-04 14:38:39 +01:00 |
|
RemoMeijer
|
2118336815
|
Switching fragment from statistics to coupon works
|
2021-01-04 11:40:06 +01:00 |
|
Bart
|
294814dea8
|
StatisticFragment navigation to CouponFragment
|
2021-01-04 10:59:43 +01:00 |
|
Sem van der Hoeven
|
3b6faf0672
|
[ADD] packages and rafactored ui classes
|
2020-12-14 10:42:33 +01:00 |
|