Commit Graph

23 Commits

Author SHA1 Message Date
Bart
f5a2eabf61 Added popup functionality 2021-01-06 15:35:16 +01:00
Bart
7284b66c13 Merge branch 'languages' into follow-route 2021-01-06 14:26:39 +01:00
Bart
d018b83490 added strings 2021-01-06 14:04:37 +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
21c479076d Merge remote-tracking branch 'origin/follow-route' into Tests 2021-01-06 12:10:05 +01:00
Sem van der Hoeven
f5da1c8a83 added displaying all locations upon stopping the route 2021-01-06 11:33:15 +01:00
Bart
40e3ca3d51 Merge branch 'languages' into develop 2021-01-06 10:49:35 +01:00
Bart
6dd2f5de40 default strings.xml is now English, added more string resources 2021-01-06 10:48:23 +01:00
sebas
360198e784 65+ stand remember position and changes the theme. 2021-01-05 15:50:29 +01:00
RemoMeijer
bc8b83e4f6 Updated strings and values to @string/ 2021-01-05 13:15:25 +01:00
Sem van der Hoeven
e8af38981f added visualizing route 2021-01-05 11:25:13 +01:00
Bart
f236067706 Added English string.xml 2021-01-05 10:45:32 +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
sebas
75b7ff47cd [Added] small changes to route detail, location detail 2020-12-14 14:51:43 +01:00
Robin Koedood
d4d3e8d19f [ADD] forgot one string 2020-12-14 13:58:01 +01:00
Robin Koedood
8aa316fc97 [ADD] String values 2020-12-14 13:55:13 +01:00
Bipin
f4d74f9880 added menu items 2020-12-14 11:55:20 +01:00
Robin Koedood
7666e2fc1a [ADD]Color in theme 2020-12-14 11:15:45 +01:00
Bipin
a8add1f58e [ADD]Colours to colors file 2020-12-14 11:09:39 +01:00
Bipin
b2d3364042 Edited themes 2020-12-14 11:05:40 +01:00
sebas
4e5eea1d9f [Added] Created all fragments 2020-12-08 11:02:00 +01:00
Sem van der Hoeven
0436e494d6 [ADD] add empty project 2020-12-08 10:33:41 +01:00