Commit Graph

336 Commits

Author SHA1 Message Date
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
Robin Koedood
525d4b776d Merge remote-tracking branch 'origin/develop' into Tests 2021-01-06 11:14:19 +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
Robin Koedood
da2a9e43bc Merge remote-tracking branch 'origin/Tests' into Tests 2021-01-06 10:50:18 +01:00
Robin Koedood
3d1cfd244b [ADD] Main Activity Test 2021-01-06 10:50:14 +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
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
Bipin
399652c2ce Merge branch 'Tests' of https://github.com/SemvdH/Next-Location into Tests 2021-01-06 10:41:10 +01:00
Bipin
d9a6e1eff0 GeometryStart 2021-01-06 10:41:07 +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
Bart
00d306631b Finished language functionality 2021-01-05 17:19:09 +01:00
Robin Koedood
20c09c3458 [TRIED] MainActivity Test 2021-01-05 16:52:48 +01:00
Sem van der Hoeven
587380fd89 added updating location when you're close to it 2021-01-05 16:39:12 +01:00
Bart
f7a2a79d00 Language can be changed, doesn't refresh automatically yet 2021-01-05 16:20:43 +01:00
RemoMeijer
faa79b5553 Added all pictures 2021-01-05 16:18:46 +01:00
Robin Koedood
e71c195573 [ADD] DirectionResultTest 2021-01-05 16:11:19 +01:00
RemoMeijer
1834aec01b Updated buttons 2021-01-05 16:10:06 +01:00
Robin Koedood
d4d452e723 Merge remote-tracking branch 'origin/Tests' into Tests 2021-01-05 16:04:32 +01:00
Robin Koedood
f381a29274 [ADD] DirectionsStep test 2021-01-05 16:04:25 +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
Bart
fe5a5b6dfd Added functionality to the dropdown in settings. Language preference is stored in the sharedPreferences 2021-01-05 13:38:21 +01:00
Bipin
7e0b888974 Merge branch 'Tests' of https://github.com/SemvdH/Next-Location into Tests 2021-01-05 13:36:43 +01:00
Bipin
804bdddbef Remove detail 2021-01-05 13:36:14 +01:00
Robin Koedood
e1636c6bec Merge remote-tracking branch 'origin/Tests' into Tests 2021-01-05 13:32:50 +01:00
Robin Koedood
77a6226c1d [ADD] Comments 2021-01-05 13:32:44 +01:00
RemoMeijer
2e5f57aa23 Added coupon arrow 2021-01-05 13:32:28 +01:00
Bipin
c6b33f2663 fixie 2021-01-05 13:29:33 +01:00
Bipin
ba83d69c9f Merge branch 'Tests' of https://github.com/SemvdH/Next-Location into Tests
# Conflicts:
#	app/src/main/res/layout/fragment_settings.xml
2021-01-05 13:27:46 +01:00
Bipin
08902472a3 Added Settings and Statistics, started detail 2021-01-05 13:27:25 +01:00
RemoMeijer
fbf8cbe1c5 Small fix 2021-01-05 13:23:48 +01:00
Robin Koedood
e36e853875 [ADD] Route Fragment test 2021-01-05 13:19:27 +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
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
Robin Koedood
3b363b3f33 [ADD] Location Detail Fragment Test 2021-01-05 12:07:15 +01:00
Robin Koedood
89902a5962 Merge remote-tracking branch 'origin/RecyclerView' into Tests 2021-01-05 12:03:36 +01:00