Sem van der Hoeven
|
ba9569b5a8
|
Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route
|
2021-01-06 13:45:53 +01:00 |
|
Sem van der Hoeven
|
98eeba4de1
|
comments
|
2021-01-06 13:42:26 +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
|
1f53890a4b
|
added comments
|
2021-01-06 12:08:18 +01:00 |
|
RemoMeijer
|
09ced99654
|
Added route
|
2021-01-06 11:59:45 +01:00 |
|
sebas
|
86bc0f0c19
|
Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView
# Conflicts:
# app/src/main/assets/locations.json
|
2021-01-06 11:56:14 +01:00 |
|
sebas
|
deb599db25
|
Font now changes according to last change when starting application, added scrollView to location detail, location detail now takes location name and description and added 2 discriptions to location.json
|
2021-01-06 11:54:39 +01:00 |
|
RemoMeijer
|
9be5ba27ab
|
Added descriptions on all locations
|
2021-01-06 11:47:14 +01:00 |
|
Sem van der Hoeven
|
926a984c71
|
stop icon
|
2021-01-06 11:33:35 +01:00 |
|
Sem van der Hoeven
|
f5da1c8a83
|
added displaying all locations upon stopping the route
|
2021-01-06 11:33:15 +01:00 |
|
sebas
|
0e63bff0f1
|
Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView
# Conflicts:
# app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
|
2021-01-06 11:13:16 +01:00 |
|
sebas
|
5e76ced998
|
Location detail now displays images
|
2021-01-06 11:12:33 +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
|
80764591ad
|
comment
|
2021-01-06 10:36:37 +01:00 |
|
sebas
|
738a733b72
|
Location adapter also now implements images into to location items
|
2021-01-06 10:20:55 +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
|
faa79b5553
|
Added all pictures
|
2021-01-05 16:18:46 +01:00 |
|
RemoMeijer
|
1834aec01b
|
Updated buttons
|
2021-01-05 16:10:06 +01:00 |
|
Sem van der Hoeven
|
062739ac7b
|
added navigation to location from map
|
2021-01-05 16:02:48 +01:00 |
|
sebas
|
360198e784
|
65+ stand remember position and changes the theme.
|
2021-01-05 15:50:29 +01:00 |
|
Sem van der Hoeven
|
16bd30f785
|
added locations to map
|
2021-01-05 13:43:10 +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
|
bc8b83e4f6
|
Updated strings and values to @string/
|
2021-01-05 13:15:25 +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
|
d63b150275
|
Improved fragments
|
2021-01-05 10:47:35 +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 |
|
Sem van der Hoeven
|
a12493972a
|
Merge branch 'directions-api' into develop
|
2021-01-04 15:47:31 +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 |
|
Robin Koedood
|
29b3623ab5
|
Merge remote-tracking branch 'origin/Tests' into Tests
|
2021-01-04 15:27:58 +01:00 |
|
Robin Koedood
|
da45a0a40e
|
[TRIED] Test FileIO class
No luck so far
|
2021-01-04 15:27:52 +01:00 |
|
Sem van der Hoeven
|
5e218f3b99
|
added getting directions for whole route
|
2021-01-04 15:20:24 +01:00 |
|
sebas
|
e761dd80e5
|
Adjusted frame layout in main fragment so that topbar now longer displays over the top part of fragments, but instead above it.
|
2021-01-04 14:46:15 +01:00 |
|
sebas
|
79e24621e2
|
Statistics now shows amount of coupons
|
2021-01-04 14:38:39 +01:00 |
|
RemoMeijer
|
1549fc7a59
|
Coupon layout updated
|
2021-01-04 14:35:50 +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 |
|
RemoMeijer
|
d96a54863c
|
coupons working
|
2021-01-04 13:04:02 +01:00 |
|