Robin Koedood
|
ca8d291262
|
[CHANGED] String values
|
2021-01-06 13:44:17 +01:00 |
|
Robin Koedood
|
f0ef9512a0
|
Merge remote-tracking branch 'origin/RecyclerView' into Tests
|
2021-01-06 13:32:22 +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 |
|
Robin Koedood
|
0ed16ee069
|
[CHANGED] String values
|
2021-01-06 12:08:25 +01:00 |
|
Robin Koedood
|
525d4b776d
|
Merge remote-tracking branch 'origin/develop' into Tests
|
2021-01-06 11:14:19 +01:00 |
|
Bart
|
40e3ca3d51
|
Merge branch 'languages' into develop
|
2021-01-06 10:49:35 +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 |
|
Robin Koedood
|
356ee55375
|
Merge remote-tracking branch 'origin/RecyclerView' into Tests
|
2021-01-05 13:16:30 +01:00 |
|
RemoMeijer
|
bc8b83e4f6
|
Updated strings and values to @string/
|
2021-01-05 13:15:25 +01:00 |
|
Robin Koedood
|
89902a5962
|
Merge remote-tracking branch 'origin/RecyclerView' into Tests
|
2021-01-05 12:03:36 +01:00 |
|
RemoMeijer
|
d53f63a6d7
|
Updated values
|
2021-01-05 12:02:20 +01:00 |
|
Robin Koedood
|
d3cab8c70d
|
[ADD] Location Tests + ID at every XML file
|
2021-01-05 10:58:33 +01:00 |
|
Bart
|
f236067706
|
Added English string.xml
|
2021-01-05 10:45:32 +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 |
|
Robin Koedood
|
8aa316fc97
|
[ADD] String values
|
2020-12-14 13:55:13 +01:00 |
|
Robin Koedood
|
ed6d80b399
|
[ADD] Imagebutton
|
2020-12-14 13:50:46 +01:00 |
|
Robin Koedood
|
49ec448e56
|
[FIXED] offset
|
2020-12-14 13:40:48 +01:00 |
|
Robin Koedood
|
9622d3d068
|
[ADD] Coupons fragments, changed box height
|
2020-12-14 12:33:28 +01:00 |
|
Robin Koedood
|
a2365d1c19
|
[ADD] Statistieken en settings fragments
|
2020-12-14 12:20:51 +01:00 |
|
Sem van der Hoeven
|
3b6faf0672
|
[ADD] packages and rafactored ui classes
|
2020-12-14 10:42:33 +01:00 |
|
sebas
|
4e5eea1d9f
|
[Added] Created all fragments
|
2020-12-08 11:02:00 +01:00 |
|