Commit Graph

15 Commits

Author SHA1 Message Date
Bipin
cf650f6cf4 colourFix 2021-01-12 10:18:04 +01:00
Sem van der Hoeven
edfc125427 added icon 2021-01-06 15:37:10 +01:00
Sem van der Hoeven
15608bed2b added icon to drawable 2021-01-06 15:32: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
926a984c71 stop icon 2021-01-06 11:33:35 +01:00
RemoMeijer
faa79b5553 Added all pictures 2021-01-05 16:18:46 +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
Sem van der Hoeven
5edf50c808 Merge branch 'Fragment' into develop 2020-12-17 10:07:36 +01:00
Robin Koedood
4229acf87c [ADD] Route Detail Contraints 2020-12-16 11:20:52 +01:00
Sem van der Hoeven
ea59b97f0f merge fragment 2020-12-14 15:09:59 +01:00
Bipin
83796481e8 back button image added 2020-12-14 13:41:23 +01:00
Bipin
64f76f46c0 Added top bar 2020-12-14 13:35:16 +01:00
Bipin
180f7fc051 fixed icon in navbar 2020-12-14 13:13:36 +01:00
Bart
ad6e171a14 [ADD] bottomNav functionality
TODO: change placeholder icons
2020-12-14 12:22:26 +01:00
Sem van der Hoeven
0436e494d6 [ADD] add empty project 2020-12-08 10:33:41 +01:00