Merge branch 'RecyclerView' into follow-route

Browse Source

# 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

...

This commit is contained in:

RemoMeijer

2021-01-06 13:20:52 +01:00

parent 1f53890a4b 09ced99654

commit 391792a5e2

44 changed files with 233 additions and 115 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

app/src/main/res/drawable/beach_and_lounge_club.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 67 KiB

BIN

app/src/main/res/drawable/belcrum_beach.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 94 KiB

BIN

app/src/main/res/drawable/belcrum_watertoren.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 780 KiB

BIN

app/src/main/res/drawable/coffee_and_lunch.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 981 KiB

BIN

app/src/main/res/drawable/de_boter_hal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 MiB

BIN

app/src/main/res/drawable/de_koepel_future_events.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 MiB

BIN

app/src/main/res/drawable/escaping_room.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 619 KiB

BIN

app/src/main/res/drawable/gauchos.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 72 KiB

BIN

app/src/main/res/drawable/hercules_park_valkenburg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 MiB

BIN

app/src/main/res/drawable/het_klooster_breda.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 MiB

BIN

app/src/main/res/drawable/kees_kroket.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 MiB

BIN

app/src/main/res/drawable/koningin_wilhelimna_paviljoen.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 145 KiB

BIN

app/src/main/res/drawable/mc_donalds.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 MiB

BIN

app/src/main/res/drawable/mezz_breda.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 186 KiB

BIN

app/src/main/res/drawable/nassau_baroniemonument.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 432 KiB

BIN

app/src/main/res/drawable/prison_escape_room.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 MiB

BIN

app/src/main/res/drawable/station_breda.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 502 KiB

BIN

app/src/main/res/drawable/subway.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 648 KiB

BIN

app/src/main/res/drawable/t_zusje_breda.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 MiB

BIN

app/src/main/res/drawable/the_tosti_club.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 MiB

BIN

app/src/main/res/drawable/vr_world.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 324 KiB

BIN

app/src/main/res/drawable/wok_to_go.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 264 KiB